diff --git a/.bundled-extensions.json b/.bundled-extensions.json
deleted file mode 100644
index f521c01dfd..0000000000
--- a/.bundled-extensions.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "extensions": [
-    "pod-menu",
-    "node-menu",
-    "metrics-cluster-feature",
-    "kube-object-event-status"
-  ]
-}
diff --git a/.eslintrc.js b/.eslintrc.js
index 733f644615..52ba26dcb3 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -12,11 +12,21 @@ module.exports = {
     "**/static/**/*",
     "**/site/**/*",
     "extensions/*/*.tgz",
+    "build/webpack/**/*",
   ],
   settings: {
     react: {
       version: packageJson.devDependencies.react || "detect",
     },
+    "import/parsers": {
+      "@typescript-eslint/parser": [".ts", ".tsx"],
+    },
+    "import/resolver": {
+      "typescript": {
+        "alwaysTryTypes": true,
+        "project": "./tsconfig.json",
+      },
+    },
   },
   overrides: [
     {
diff --git a/.github/workflows/add-to-project-board.yaml b/.github/workflows/add-to-project-board.yaml
index 8f23cd406c..5ebb3de16e 100644
--- a/.github/workflows/add-to-project-board.yaml
+++ b/.github/workflows/add-to-project-board.yaml
@@ -13,21 +13,21 @@ jobs:
     runs-on: ubuntu-latest
     name: Add Card to Project(s)
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Get Event Type
-      run: echo $GITHUB_EVENT_NAME
-    - name: Assign NEW issues to project 1
-      uses: ./.github/actions/add-card-to-project
-      if: github.event_name == 'issues' && github.event.action == 'opened'
-      with:
-        project: 'https://github.com/orgs/lensapp/projects/1'
-        column_name: 'Backlog'
-        card_position: 'bottom'
-    - name: Assign NEW pull requests to project 1
-      uses: ./.github/actions/add-card-to-project
-      if: github.event_name == 'pull_request_target' && github.event.action == 'opened'
-      with:
-        project: 'https://github.com/orgs/lensapp/projects/1'
-        column_name: 'PRs'
-        card_position: 'bottom'
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Get Event Type
+        run: echo $GITHUB_EVENT_NAME
+      - name: Assign NEW issues to project 1
+        uses: ./.github/actions/add-card-to-project
+        if: github.event_name == 'issues' && github.event.action == 'opened'
+        with:
+          project: "https://github.com/orgs/lensapp/projects/1"
+          column_name: "Backlog"
+          card_position: "bottom"
+      - name: Assign NEW pull requests to project 1
+        uses: ./.github/actions/add-card-to-project
+        if: github.event_name == 'pull_request_target' && github.event.action == 'opened'
+        with:
+          project: "https://github.com/orgs/lensapp/projects/1"
+          column_name: "PRs"
+          card_position: "bottom"
diff --git a/.github/workflows/bump-master-version.yaml b/.github/workflows/bump-master-version.yaml
new file mode 100644
index 0000000000..7c4d06ad2b
--- /dev/null
+++ b/.github/workflows/bump-master-version.yaml
@@ -0,0 +1,35 @@
+name: Bump Version on master
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    if: ${{ github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'release') }}
+    steps:
+      - name: Checkout Release from lens
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Install dependencies
+        run: |
+          npm i --location=global semver
+      - name: Bump version to first alpha of next minor version
+        run: |
+          NEW_VERSION=$(cat package.json | jq .version --raw-output| xargs semver -i preminor --preid alpha)
+          cat package.json | jq --arg new_version "$NEW_VERSION" '.version = $new_version' > new-package.json
+          mv new-package.json package.json
+      - uses: peter-evans/create-pull-request@v4
+        with:
+          add-paths: package.json
+          commit-message: Update package.json version to next preminor because of recent release
+          signoff: true
+          delete-branch: true
+          title: Update version to next preminor
+          labels: chore
diff --git a/.github/workflows/check-docs.yml b/.github/workflows/check-docs.yml
index 7418a86269..defc5f3ca1 100644
--- a/.github/workflows/check-docs.yml
+++ b/.github/workflows/check-docs.yml
@@ -12,12 +12,12 @@ jobs:
         node-version: [16.x]
     steps:
       - name: Checkout Release from lens
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Using Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index fc2692be70..e764763208 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -13,12 +13,12 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [master]
   schedule:
-    - cron: '41 3 * * 2'
+    - cron: "41 3 * * 2"
 
 jobs:
   analyze:
@@ -32,40 +32,40 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript' ]
+        language: ["javascript"]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      #- run: |
+      #   make bootstrap
+      #   make release
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/electronegativity.yml b/.github/workflows/electronegativity.yml
index 0cc4340f39..6ba06e2721 100644
--- a/.github/workflows/electronegativity.yml
+++ b/.github/workflows/electronegativity.yml
@@ -10,9 +10,9 @@ jobs:
   build_job:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: "16"
 
diff --git a/.github/workflows/license-header.yml b/.github/workflows/license-header.yml
index 20b0a01d19..2e33292785 100644
--- a/.github/workflows/license-header.yml
+++ b/.github/workflows/license-header.yml
@@ -11,18 +11,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Golang
-      uses: actions/setup-go@v2
-      with:
-        go-version: '^1.18.0'
-    - name: Install addlicense
-      run: |
-        export PATH=${PATH}:`go env GOPATH`/bin
-        go install github.com/google/addlicense@v1.0.0
-    - name: Check license headers
-      run: |
-        set -e
-        export PATH=${PATH}:`go env GOPATH`/bin
+      - uses: actions/checkout@v3
+      - name: Set up Golang
+        uses: actions/setup-go@v2
+        with:
+          go-version: "^1.18.0"
+      - name: Install addlicense
+        run: |
+          export PATH=${PATH}:`go env GOPATH`/bin
+          go install github.com/google/addlicense@v1.0.0
+      - name: Check license headers
+        run: |
+          set -e
+          export PATH=${PATH}:`go env GOPATH`/bin
 
-        addlicense -check -l mit -c "OpenLens Authors" src/**/*.?css
+          addlicense -check -l mit -c "OpenLens Authors" src/**/*.?css
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index ac7ac673ca..e1b0bac244 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -10,12 +10,12 @@ jobs:
         node-version: [16.x]
     steps:
       - name: Checkout Release from lens
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Using Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2fa32efc65..949a4463cb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,12 +23,12 @@ jobs:
           python-version: "3.x"
 
       - name: Checkout Release from lens
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Using Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -61,7 +61,7 @@ jobs:
           pip install mike
 
       - name: Checkout Release from lens
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -71,7 +71,7 @@ jobs:
           git config --local user.name "GitHub Action"
 
       - name: Using Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -88,7 +88,7 @@ jobs:
       - name: Get the release version
         if: contains(github.ref, 'refs/tags/v') && !github.event.release.prerelease
         id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+        run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
 
       - name: mkdocs deploy new release
         if: contains(github.ref, 'refs/tags/v') && !github.event.release.prerelease
diff --git a/.github/workflows/mkdocs-delete-version.yml b/.github/workflows/mkdocs-delete-version.yml
index 0183910d8d..a5ff72b8cb 100644
--- a/.github/workflows/mkdocs-delete-version.yml
+++ b/.github/workflows/mkdocs-delete-version.yml
@@ -13,26 +13,24 @@ jobs:
       - name: Set up Python 3.7
         uses: actions/setup-python@v2
         with:
-          python-version: '3.x'
+          python-version: "3.x"
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install git+https://${{ secrets.GH_TOKEN }}@github.com/lensapp/mkdocs-material-insiders.git
           pip install mike
-          
+
       - name: Checkout Release from lens
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: git config
         run: |
-           git config --local user.email "action@github.com"
-           git config --local user.name "GitHub Action"
-
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
 
       - name: mkdocs delete version
         run: |
-           mike delete --push ${{ github.event.inputs.version }}
-           
\ No newline at end of file
+          mike delete --push ${{ github.event.inputs.version }}
diff --git a/.github/workflows/mkdocs-manual.yml b/.github/workflows/mkdocs-manual.yml
index 56bfd0c831..6ca8def8e4 100644
--- a/.github/workflows/mkdocs-manual.yml
+++ b/.github/workflows/mkdocs-manual.yml
@@ -25,13 +25,13 @@ jobs:
           pip install mike
 
       - name: Checkout Version from lens
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           ref: "${{ github.event.inputs.version }}"
 
       - name: Using Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -41,7 +41,7 @@ jobs:
           yarn typedocs-extensions-api
 
       - name: Checkout master branch from lens
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: "master"
           ref: "master"
@@ -53,9 +53,9 @@ jobs:
           rm -fr ./docs/clusters ./docs/contributing ./docs/faq ./docs/getting-started ./docs/helm ./docs/support ./docs/supporting
           sed -i '/Protocol Handlers/d' ./mkdocs.yml
           sed -i '/IPC/d' ./mkdocs.yml
-          sed -i 's#../../clusters/adding-clusters.md#https://docs.k8slens.dev/latest/clusters/adding-clusters/#g' ./docs/extensions/get-started/your-first-extension.md
-          sed -i 's#clusters/adding-clusters.md#https://docs.k8slens.dev/latest/clusters/adding-clusters/#g' ./docs/README.md
-          sed -i 's#../../contributing/README.md#https://docs.k8slens.dev/latest/contributing/#g' ./docs/extensions/guides/generator.md
+          sed -i 's#../../clusters/adding-clusters.md#https://docs.k8slens.dev/getting-started/add-cluster/#g' ./docs/extensions/get-started/your-first-extension.md
+          sed -i 's#clusters/adding-clusters.md#https://docs.k8slens.dev//getting-started/adding-clusters/#g' ./docs/README.md
+          sed -i 's#../../contributing/README.md#https://docs.k8slens.dev/contributing/#g' ./docs/extensions/guides/generator.md
 
       - name: git config
         run: |
diff --git a/.github/workflows/mkdocs-set-default-version.yml b/.github/workflows/mkdocs-set-default-version.yml
index 694a7af726..a4bcf5fbb2 100644
--- a/.github/workflows/mkdocs-set-default-version.yml
+++ b/.github/workflows/mkdocs-set-default-version.yml
@@ -13,26 +13,24 @@ jobs:
       - name: Set up Python 3.7
         uses: actions/setup-python@v2
         with:
-          python-version: '3.x'
+          python-version: "3.x"
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install git+https://${{ secrets.GH_TOKEN }}@github.com/lensapp/mkdocs-material-insiders.git
           pip install mike
-          
+
       - name: Checkout Release from lens
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: git config
         run: |
-           git config --local user.email "action@github.com"
-           git config --local user.name "GitHub Action"
-
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
 
       - name: mkdocs update default version
         run: |
-           mike set-default --push ${{ github.event.inputs.version }}
-           
\ No newline at end of file
+          mike set-default --push ${{ github.event.inputs.version }}
diff --git a/.github/workflows/publish-master-npm.yml b/.github/workflows/publish-master-npm.yml
index 31f86ae6f0..620245dc70 100644
--- a/.github/workflows/publish-master-npm.yml
+++ b/.github/workflows/publish-master-npm.yml
@@ -17,12 +17,12 @@ jobs:
         node-version: [16.x]
     steps:
       - name: Checkout Release
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Using Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
diff --git a/.github/workflows/publish-release-npm.yml b/.github/workflows/publish-release-npm.yml
index becca1f790..0ce928e3d1 100644
--- a/.github/workflows/publish-release-npm.yml
+++ b/.github/workflows/publish-release-npm.yml
@@ -12,12 +12,12 @@ jobs:
         node-version: [16.x]
     steps:
       - name: Checkout Release
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Using Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
deleted file mode 100644
index ec49fec6e5..0000000000
--- a/.github/workflows/release-drafter.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Release Drafter
-
-on:
-  push:
-    # branches to consider in the event; optional, defaults to all
-    branches:
-      - master
-
-jobs:
-  update_release_draft:
-    runs-on: ubuntu-latest
-    steps:
-      # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000000..f66347a93f
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,30 @@
+name: Release Open Lens
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - master
+      - release/v*.*
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    if: ${{ github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'release') }}
+    steps:
+      - name: Checkout Release from lens
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: butlerlogic/action-autotag@stable
+        id: tagger
+        with:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          tag_prefix: "v"
+      - uses: ncipollo/release-action@v1
+        if: ${{ steps.tagger.outputs.tagname != '' }}
+        with:
+          name: ${{ steps.tagger.outputs.tagname }}
+          commit: master
+          tag: ${{ steps.tagger.outputs.tagname }}
+          body: ${{ github.event.pull_request.body }}
diff --git a/.github/workflows/require-milestone.yml b/.github/workflows/require-milestone.yml
new file mode 100644
index 0000000000..8fc2c28ba2
--- /dev/null
+++ b/.github/workflows/require-milestone.yml
@@ -0,0 +1,14 @@
+name: Require Milestone
+on:
+  pull_request:
+    types: [opened, edited, synchronize]
+jobs:
+  milestone:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Require Milestone
+        run: |
+          exit $(gh pr view ${{ github.event.pull_request.number }} --json milestone | jq 'if .milestone == null then 1 else 0 end')
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9aaeec71f6..ee1ab58970 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,17 +7,18 @@ on:
     branches:
       - master
 jobs:
-  build:
-    name: Test
+  test:
+    name: ${{ matrix.type }} tests on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, macos-11, windows-2019]
+        type: [unit, smoke]
         node-version: [16.x]
     steps:
       - name: Checkout Release from lens
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -27,15 +28,16 @@ jobs:
           echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
 
       - name: Using Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        shell: bash
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -51,25 +53,16 @@ jobs:
           retry_on: error
           command: make node_modules
 
-      - run: make build-npm
-        name: Generate npm package
-
-      - uses: nick-fields/retry@v2
-        name: Build bundled extensions
-        with:
-          timeout_minutes: 15
-          max_attempts: 3
-          retry_on: error
-          command: make -j2 build-extensions
-
       - run: make test
         name: Run tests
+        if: ${{ matrix.type == 'unit' }}
 
       - run: make test-extensions
         name: Run In-tree Extension tests
+        if: ${{ matrix.type == 'unit' }}
 
       - run: make ci-validate-dev
-        if: contains(github.event.pull_request.labels.*.name, 'dependencies')
+        if: ${{ contains(github.event.pull_request.labels.*.name, 'dependencies') && matrix.type == 'unit' }}
         name: Validate dev mode will work
 
       - name: Install integration test dependencies
@@ -77,22 +70,22 @@ jobs:
         uses: medyagh/setup-minikube@master
         with:
           minikube-version: latest
-        if: runner.os == 'Linux'
+        if: ${{ runner.os == 'Linux' && matrix.type == 'smoke' }}
 
       - run: xvfb-run --auto-servernum --server-args='-screen 0, 1600x900x24' make integration
         name: Run Linux integration tests
-        if: runner.os == 'Linux'
+        if: ${{ runner.os == 'Linux' && matrix.type == 'smoke' }}
 
       - run: make integration
         name: Run macOS integration tests
         shell: bash
         env:
           ELECTRON_BUILDER_EXTRA_ARGS: "--x64 --arm64"
-        if: runner.os == 'macOS'
+        if: ${{ runner.os == 'macOS' && matrix.type == 'smoke' }}
 
       - run: make integration
         name: Run Windows integration tests
         shell: bash
         env:
           ELECTRON_BUILDER_EXTRA_ARGS: "--x64 --ia32"
-        if: runner.os == 'Windows'
+        if: ${{ runner.os == 'Windows' && matrix.type == 'smoke' }}
diff --git a/.gitignore b/.gitignore
index d018f3b251..0a79ea77c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ types/extension-renderer-api.d.ts
 extensions/*/dist
 docs/extensions/api
 site/
+build/webpack/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1c745f852d..beb082afe9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,3 @@
 # Contributing to Lens
 
-See [Contributing to Lens](https://docs.k8slens.dev/latest/contributing/) documentation.
+See [Contributing to Lens](https://docs.k8slens.dev/contributing/) documentation.
diff --git a/Makefile b/Makefile
index d04b3febe1..857f14b2cb 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ tag-release:
 	scripts/tag-release.sh $(CMD_ARGS)
 
 .PHONY: test
-test: binaries/client
+test: node_modules binaries/client
 	yarn run jest $(or $(CMD_ARGS), "src")
 
 .PHONY: integration
@@ -53,7 +53,6 @@ integration: build
 
 .PHONY: build
 build: node_modules binaries/client
-	yarn run npm:fix-build-version
 	$(MAKE) build-extensions -B
 	yarn run build:tray-icons
 	yarn run compile
@@ -63,10 +62,6 @@ ifeq "$(DETECTED_OS)" "Windows"
 endif
 	yarn run electron-builder --publish onTag $(ELECTRON_BUILDER_EXTRA_ARGS)
 
-.PHONY: update-extension-locks
-update-extension-locks:
-	$(foreach dir, $(extensions), (cd $(dir) && rm package-lock.json && ../../node_modules/.bin/npm install --package-lock-only);)
-
 .NOTPARALLEL: $(extension_node_modules)
 $(extension_node_modules): node_modules
 	cd $(@:/node_modules=) && ../../node_modules/.bin/npm install --no-audit --no-fund --no-save
@@ -92,7 +87,7 @@ src/extensions/npm/extensions/dist: src/extensions/npm/extensions/node_modules
 	yarn compile:extension-types
 
 src/extensions/npm/extensions/node_modules: src/extensions/npm/extensions/package.json
-	cd src/extensions/npm/extensions/ && ../../../../node_modules/.bin/npm install --no-audit --no-fund
+	cd src/extensions/npm/extensions/ && ../../../../node_modules/.bin/npm install --no-audit --no-fund --no-save
 
 .PHONY: build-npm
 build-npm: build-extension-types src/extensions/npm/extensions/__mocks__
diff --git a/README.md b/README.md
index 5e97035d0f..f581e90401 100644
--- a/README.md
+++ b/README.md
@@ -19,12 +19,16 @@ Lens IDE a standalone application for MacOS, Windows and Linux operating systems
 
 ## Installation
 
-See [Getting Started](https://docs.k8slens.dev/main/getting-started/install-lens/) page.
+See [Getting Started](https://docs.k8slens.dev/getting-started/install-lens/) page.
 
 ## Development
 
-See [Development](https://docs.k8slens.dev/latest/contributing/development/) page.
+See [Development](https://docs.k8slens.dev/contributing/development/) page.
 
 ## Contributing
 
-See [Contributing](https://docs.k8slens.dev/latest/contributing/) page.
+See [Contributing](https://docs.k8slens.dev/contributing/) page.
+
+## License
+
+See [License](LICENSE).
diff --git a/RELEASE_GUIDE.md b/RELEASE_GUIDE.md
new file mode 100644
index 0000000000..559385f025
--- /dev/null
+++ b/RELEASE_GUIDE.md
@@ -0,0 +1,19 @@
+# Release Guide
+
+Releases for this repository are made via running the `create-release-pr` script defined in the `package.json`.
+All releases will be made by creating a PR which bumps the version field in the `package.json` and, if necessary, cherry pick the relavent commits from master.
+
+## Prerequisites
+
+- `yarn`
+- Running `yarn` (to install all dependencies)
+- `gh` (Github's CLI) with a version at least 2.15.0
+
+## Steps
+
+1. If you are making a minor or major release (or prereleases for one) make sure you are on the `master` branch.
+1. If you are making a patch release (or a prerelease for one) make sure you are on the `release/v<MAJOR>.<MINOR>` branch.
+1. Run `yarn create-release-pr <release-type>`. If you are making a subsequent prerelease release, provide the `--check-commits` flag.
+1. If you are checking the commits, type `y<ENTER>` to pick a commit, and `n<ENTER>` to skip it. You will want to skip the commits that were part of previous prerelease releases.
+1. Once the PR is created, approved, and then merged the `Release Open Lens` workflow will create a tag and release for you.
+1. If you are making a major or minor release, create a `release/v<MAJOR>.<MINOR>` branch and push it to `origin` so that future patch releases can be made from it.
diff --git a/__mocks__/windowMock.ts b/__mocks__/windowMock.ts
deleted file mode 100644
index bcc3da05a6..0000000000
--- a/__mocks__/windowMock.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-/**
- * Mock the global window variable
- */
-export function mockWindow() {
-  Object.defineProperty(window, "requestIdleCallback", {
-    writable: true,
-    value: jest.fn().mockImplementation(callback => callback()),
-  });
-
-  Object.defineProperty(window, "cancelIdleCallback", {
-    writable: true,
-    value: jest.fn(),
-  });
-}
diff --git a/build/download_binaries.ts b/build/download_binaries.ts
index ff26a8fb2b..826c713fd3 100644
--- a/build/download_binaries.ts
+++ b/build/download_binaries.ts
@@ -8,18 +8,30 @@ import { open } from "fs/promises";
 import type { WriteStream } from "fs-extra";
 import { constants, ensureDir, unlink } from "fs-extra";
 import path from "path";
-import fetch from "node-fetch";
+import type * as FetchModule from "node-fetch";
 import { promisify } from "util";
 import { pipeline as _pipeline, Transform, Writable } from "stream";
 import type { SingleBar } from "cli-progress";
 import { MultiBar } from "cli-progress";
 import { extract } from "tar-stream";
 import gunzip from "gunzip-maybe";
-import { getBinaryName, normalizedPlatform } from "../src/common/vars";
-import { isErrnoException } from "../src/common/utils";
+import { isErrnoException, setTimeoutFor } from "../src/common/utils";
+import AbortController from "abort-controller";
+
+type Response = FetchModule.Response;
+type RequestInfo = FetchModule.RequestInfo;
+type RequestInit = FetchModule.RequestInit;
 
 const pipeline = promisify(_pipeline);
 
+const getBinaryName = (binaryName: string, { forPlatform }: { forPlatform : string }) => {
+  if (forPlatform === "windows") {
+    return `${binaryName}.exe`;
+  }
+
+  return binaryName;
+};
+
 interface BinaryDownloaderArgs {
   readonly version: string;
   readonly platform: SupportedPlatform;
@@ -29,6 +41,10 @@ interface BinaryDownloaderArgs {
   readonly baseDir: string;
 }
 
+interface BinaryDownloaderDependencies {
+  fetch: (url: RequestInfo, init?: RequestInit) => Promise<Response>;
+}
+
 abstract class BinaryDownloader {
   protected abstract readonly url: string;
   protected readonly bar: SingleBar;
@@ -38,7 +54,7 @@ abstract class BinaryDownloader {
     return [file];
   }
 
-  constructor(public readonly args: BinaryDownloaderArgs, multiBar: MultiBar) {
+  constructor(protected readonly dependencies: BinaryDownloaderDependencies, public readonly args: BinaryDownloaderArgs, multiBar: MultiBar) {
     this.bar = multiBar.create(1, 0, args);
     this.target = path.join(args.baseDir, args.platform, args.fileArch, args.binaryName);
   }
@@ -49,8 +65,10 @@ abstract class BinaryDownloader {
     }
 
     const controller = new AbortController();
-    const stream = await fetch(this.url, {
-      timeout: 15 * 60 * 1000, // 15min
+
+    setTimeoutFor(controller, 15 * 60 * 1000);
+
+    const stream = await this.dependencies.fetch(this.url, {
       signal: controller.signal,
     });
     const total = Number(stream.headers.get("content-length"));
@@ -72,6 +90,10 @@ abstract class BinaryDownloader {
        */
       const handle = fileHandle = await open(this.target, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL);
 
+      if (!stream.body) {
+        throw new Error("no body on stream");
+      }
+
       await pipeline(
         stream.body,
         new Transform({
@@ -108,10 +130,10 @@ abstract class BinaryDownloader {
 class LensK8sProxyDownloader extends BinaryDownloader {
   protected readonly url: string;
 
-  constructor(args: Omit<BinaryDownloaderArgs, "binaryName">, bar: MultiBar) {
+  constructor(deps: BinaryDownloaderDependencies, args: Omit<BinaryDownloaderArgs, "binaryName">, bar: MultiBar) {
     const binaryName = getBinaryName("lens-k8s-proxy", { forPlatform: args.platform });
 
-    super({ ...args, binaryName }, bar);
+    super(deps, { ...args, binaryName }, bar);
     this.url = `https://github.com/lensapp/lens-k8s-proxy/releases/download/v${args.version}/lens-k8s-proxy-${args.platform}-${args.downloadArch}`;
   }
 }
@@ -119,10 +141,10 @@ class LensK8sProxyDownloader extends BinaryDownloader {
 class KubectlDownloader extends BinaryDownloader {
   protected readonly url: string;
 
-  constructor(args: Omit<BinaryDownloaderArgs, "binaryName">, bar: MultiBar) {
+  constructor(deps: BinaryDownloaderDependencies, args: Omit<BinaryDownloaderArgs, "binaryName">, bar: MultiBar) {
     const binaryName = getBinaryName("kubectl", { forPlatform: args.platform });
 
-    super({ ...args, binaryName }, bar);
+    super(deps, { ...args, binaryName }, bar);
     this.url = `https://storage.googleapis.com/kubernetes-release/release/v${args.version}/bin/${args.platform}/${args.downloadArch}/${binaryName}`;
   }
 }
@@ -130,10 +152,10 @@ class KubectlDownloader extends BinaryDownloader {
 class HelmDownloader extends BinaryDownloader {
   protected readonly url: string;
 
-  constructor(args: Omit<BinaryDownloaderArgs, "binaryName">, bar: MultiBar) {
+  constructor(deps: BinaryDownloaderDependencies, args: Omit<BinaryDownloaderArgs, "binaryName">, bar: MultiBar) {
     const binaryName = getBinaryName("helm", { forPlatform: args.platform });
 
-    super({ ...args, binaryName }, bar);
+    super(deps, { ...args, binaryName }, bar);
     this.url = `https://get.helm.sh/helm-v${args.version}-${args.platform}-${args.downloadArch}.tar.gz`;
   }
 
@@ -160,7 +182,24 @@ class HelmDownloader extends BinaryDownloader {
 
 type SupportedPlatform = "darwin" | "linux" | "windows";
 
+const importFetchModule = new Function('return import("node-fetch")') as () => Promise<typeof FetchModule>;
+
 async function main() {
+  const deps: BinaryDownloaderDependencies = {
+    fetch: (await importFetchModule()).default,
+  };
+  const normalizedPlatform = (() => {
+    switch (process.platform) {
+      case "darwin":
+        return "darwin";
+      case "linux":
+        return "linux";
+      case "win32":
+        return "windows";
+      default:
+        throw new Error(`platform=${process.platform} is unsupported`);
+    }
+  })();
   const multiBar = new MultiBar({
     align: "left",
     clearOnComplete: false,
@@ -171,21 +210,21 @@ async function main() {
   });
   const baseDir = path.join(__dirname, "..", "binaries", "client");
   const downloaders: BinaryDownloader[] = [
-    new LensK8sProxyDownloader({
+    new LensK8sProxyDownloader(deps, {
       version: packageInfo.config.k8sProxyVersion,
       platform: normalizedPlatform,
       downloadArch: "amd64",
       fileArch: "x64",
       baseDir,
     }, multiBar),
-    new KubectlDownloader({
+    new KubectlDownloader(deps, {
       version: packageInfo.config.bundledKubectlVersion,
       platform: normalizedPlatform,
       downloadArch: "amd64",
       fileArch: "x64",
       baseDir,
     }, multiBar),
-    new HelmDownloader({
+    new HelmDownloader(deps, {
       version: packageInfo.config.bundledHelmVersion,
       platform: normalizedPlatform,
       downloadArch: "amd64",
@@ -194,23 +233,23 @@ async function main() {
     }, multiBar),
   ];
 
-  if (normalizedPlatform === "darwin") {
+  if (normalizedPlatform !== "windows") {
     downloaders.push(
-      new LensK8sProxyDownloader({
+      new LensK8sProxyDownloader(deps, {
         version: packageInfo.config.k8sProxyVersion,
         platform: normalizedPlatform,
         downloadArch: "arm64",
         fileArch: "arm64",
         baseDir,
       }, multiBar),
-      new KubectlDownloader({
+      new KubectlDownloader(deps, {
         version: packageInfo.config.bundledKubectlVersion,
         platform: normalizedPlatform,
         downloadArch: "arm64",
         fileArch: "arm64",
         baseDir,
       }, multiBar),
-      new HelmDownloader({
+      new HelmDownloader(deps, {
         version: packageInfo.config.bundledHelmVersion,
         platform: normalizedPlatform,
         downloadArch: "arm64",
diff --git a/build/installer.nsh b/build/installer.nsh
index 8ff35b5e4f..d0fe18809a 100644
--- a/build/installer.nsh
+++ b/build/installer.nsh
@@ -1,4 +1,7 @@
 !macro customInit
+  ; Make sure all old extensions are removed
+  RMDir /r "$INSTDIR\resources\extensions"
+
   ; Workaround for installer handing when the app directory is removed manually
   ${ifNot} ${FileExists} "$INSTDIR"
     DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\{${UNINSTALL_APP_KEY}}"
diff --git a/build/notarize.js b/build/notarize.js
index ded81f6dd1..0bf1903e59 100644
--- a/build/notarize.js
+++ b/build/notarize.js
@@ -22,5 +22,6 @@ exports.default = async function notarizing(context) {
     appPath: `${appOutDir}/${appName}.app`,
     appleId: process.env.APPLEID,
     appleIdPassword: process.env.APPLEIDPASS,
+    ascProvider:process.env.ASCPROVIDER,
   });
 };
diff --git a/build/set_build_version.ts b/build/set_build_version.ts
deleted file mode 100644
index 4df7ad4b96..0000000000
--- a/build/set_build_version.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import * as fse from "fs-extra";
-import * as path from "path";
-import appInfo from "../package.json";
-import semver from "semver";
-import fastGlob from "fast-glob";
-
-const packagePath = path.join(__dirname, "../package.json");
-const versionInfo = semver.parse(appInfo.version);
-const buildNumber = process.env.BUILD_NUMBER || Date.now().toString();
-
-function getBuildChannel(): string {
-  const preRelease = versionInfo.prerelease?.[0];
-
-  switch (preRelease) {
-    case "alpha":
-    case "beta":
-    case "rc":
-      return preRelease;
-    case undefined:
-    case "latest":
-      return "latest"; // needed because electron-updater does not take build information into account when resolving if update is available
-    default:
-      throw new Error(`invalid pre-release ${preRelease}`);
-  }
-}
-
-async function writeOutExtensionVersion(manifestPath: string) {
-  const extensionPackageJson = await fse.readJson(manifestPath);
-
-  extensionPackageJson.version = appInfo.version;
-
-  return fse.writeJson(manifestPath, extensionPackageJson, {
-    spaces: 2,
-  });
-}
-
-async function writeOutNewVersions() {
-  await Promise.all([
-    fse.writeJson(packagePath, appInfo, {
-      spaces: 2,
-    }),
-    ...(await fastGlob(["extensions/*/package.json"])).map(writeOutExtensionVersion),
-  ]);
-}
-
-function main() {
-  const prereleaseParts: string[] = [getBuildChannel()];
-
-  if (versionInfo.prerelease && versionInfo.prerelease.length > 1) {
-    prereleaseParts.push(versionInfo.prerelease[1].toString());
-  }
-
-  prereleaseParts.push(buildNumber);
-
-  appInfo.version = `${versionInfo.major}.${versionInfo.minor}.${versionInfo.patch}-${prereleaseParts.join(".")}`;
-
-  writeOutNewVersions()
-    .catch((error) => {
-      console.error(error);
-      process.exit(1);
-    });
-}
-
-main();
diff --git a/docs/extensions/get-started/your-first-extension.md b/docs/extensions/get-started/your-first-extension.md
index c8c1167943..ec797f7441 100644
--- a/docs/extensions/get-started/your-first-extension.md
+++ b/docs/extensions/get-started/your-first-extension.md
@@ -78,7 +78,7 @@ npm run dev
 You must restart Lens for the extension to load.
 After this initial restart, reload Lens and it will automatically pick up changes any time the extension rebuilds.
 
-With Lens running, either connect to an existing cluster or create a new one - refer to the latest [Lens Documentation](https://docs.k8slens.dev/main/catalog/) for details on how to add a cluster in Lens IDE.
+With Lens running, either connect to an existing cluster or create a new one - refer to the latest [Lens Documentation](https://docs.k8slens.dev/getting-started/add-cluster/) for details on how to add a cluster in Lens IDE.
 You will see the "Hello World" page in the left-side cluster menu.
 
 ## Develop the Extension
diff --git a/docs/extensions/guides/generator.md b/docs/extensions/guides/generator.md
index 64838c1bc4..fbc1723b0b 100644
--- a/docs/extensions/guides/generator.md
+++ b/docs/extensions/guides/generator.md
@@ -46,14 +46,14 @@ Open `my-first-lens-ext/renderer.tsx` and change the value of `title` from `"Hel
 
 ```typescript
 clusterPageMenus = [
-    {
-        target: { pageId: "hello" },
-        title: "Hello Lens",
-        components: {
-            Icon: ExampleIcon,
-        }
-    }
-]
+  {
+    target: { pageId: "hello" },
+    title: "Hello Lens",
+    components: {
+      Icon: ExampleIcon,
+    },
+  },
+];
 ```
 
 Reload Lens and you will see that the menu item text has changed to "Hello Lens".
@@ -70,6 +70,6 @@ To debug your extension, please see our instructions on [Testing Extensions](../
 To dive deeper, consider looking at [Common Capabilities](../capabilities/common-capabilities.md), [Styling](../capabilities/styling.md), or [Extension Anatomy](anatomy.md).
 
 If you find problems with the Lens Extension Generator, or have feature requests, you are welcome to raise an [issue](https://github.com/lensapp/generator-lens-ext/issues).
-You can find the latest Lens contribution guidelines [here](https://docs.k8slens.dev/latest/contributing).
+You can find the latest Lens contribution guidelines [here](https://docs.k8slens.dev/contributing).
 
 The Generator source code is hosted at [GitHub](https://github.com/lensapp/generator-lens-ext).
diff --git a/docs/extensions/guides/renderer-extension.md b/docs/extensions/guides/renderer-extension.md
index d90a343692..4cc6e338bf 100644
--- a/docs/extensions/guides/renderer-extension.md
+++ b/docs/extensions/guides/renderer-extension.md
@@ -771,7 +771,7 @@ Construct the table using the `Renderer.Component.Table` and related elements.
 
 For each pod the name, age, and status are obtained using the `Renderer.K8sApi.Pod` methods.
 The table is constructed using the `Renderer.Component.Table` and related elements.
-See [Component documentation](https://docs.k8slens.dev/latest/extensions/api/modules/_renderer_api_components_/) for further details.
+See [Component documentation](https://api-docs.k8slens.dev/latest/extensions/api/modules/Renderer.Component/) for further details.
 
 ### `kubeObjectStatusTexts`
 
diff --git a/extensions/kube-object-event-status/package.json b/extensions/kube-object-event-status/package.json
index 53db719a83..934ebbbdb8 100644
--- a/extensions/kube-object-event-status/package.json
+++ b/extensions/kube-object-event-status/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kube-object-event-status",
-  "version": "0.0.1",
+  "version": "6.1.1",
   "description": "Adds kube object status from events",
   "renderer": "dist/renderer.js",
   "lens": {
diff --git a/extensions/kube-object-event-status/renderer.tsx b/extensions/kube-object-event-status/renderer.tsx
index 88f6156605..65b92a2658 100644
--- a/extensions/kube-object-event-status/renderer.tsx
+++ b/extensions/kube-object-event-status/renderer.tsx
@@ -35,12 +35,18 @@ export default class EventResourceStatusRendererExtension extends Renderer.LensE
     },
     {
       kind: "Job",
-      apiVersions: ["batch/v1"],
+      apiVersions: [
+        "batch/v1",
+        "batch/v1beta1",
+      ],
       resolve: (job: Renderer.K8sApi.Job) => resolveStatus(job),
     },
     {
       kind: "CronJob",
-      apiVersions: ["batch/v1"],
+      apiVersions: [
+        "batch/v1",
+        "batch/v1beta1",
+      ],
       resolve: (cronJob: Renderer.K8sApi.CronJob) => resolveStatusForCronJobs(cronJob),
     },
   ];
diff --git a/extensions/metrics-cluster-feature/package.json b/extensions/metrics-cluster-feature/package.json
index 41da8f3f86..03ad0df7a5 100644
--- a/extensions/metrics-cluster-feature/package.json
+++ b/extensions/metrics-cluster-feature/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lens-metrics-cluster-feature",
-  "version": "0.0.1",
+  "version": "6.1.0",
   "description": "Lens metrics cluster feature",
   "renderer": "dist/renderer.js",
   "lens": {
diff --git a/extensions/metrics-cluster-feature/src/metrics-settings.tsx b/extensions/metrics-cluster-feature/src/metrics-settings.tsx
index bfbeb3e10b..4ae4235780 100644
--- a/extensions/metrics-cluster-feature/src/metrics-settings.tsx
+++ b/extensions/metrics-cluster-feature/src/metrics-settings.tsx
@@ -190,7 +190,7 @@ export class MetricsSettings extends React.Component<MetricsSettingsProps> {
 
   render() {
     return (
-      <>
+      <section style={{ display: "flex", flexDirection: "column", rowGap: "1.5rem" }}>
         { this.props.cluster.status.phase !== "connected" && (
           <section>
             <p style={ { color: "var(--colorError)" } }>
@@ -270,7 +270,7 @@ export class MetricsSettings extends React.Component<MetricsSettingsProps> {
             )}
           </div>
         </section>
-      </>
+      </section>
     );
   }
 }
diff --git a/extensions/node-menu/package.json b/extensions/node-menu/package.json
index 7705b4f606..3b56dc6e62 100644
--- a/extensions/node-menu/package.json
+++ b/extensions/node-menu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lens-node-menu",
-  "version": "0.0.1",
+  "version": "6.1.0",
   "description": "Lens node menu",
   "renderer": "dist/renderer.js",
   "lens": {
diff --git a/extensions/pod-menu/package.json b/extensions/pod-menu/package.json
index 79e4278b32..ba3f107f80 100644
--- a/extensions/pod-menu/package.json
+++ b/extensions/pod-menu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lens-pod-menu",
-  "version": "0.0.1",
+  "version": "6.1.0",
   "description": "Lens pod menu",
   "renderer": "dist/renderer.js",
   "lens": {
diff --git a/integration/__tests__/app-preferences.tests.ts b/integration/__tests__/app-preferences.tests.ts
index 2054a5342d..1d7d7029fb 100644
--- a/integration/__tests__/app-preferences.tests.ts
+++ b/integration/__tests__/app-preferences.tests.ts
@@ -13,7 +13,8 @@ import type { ElectronApplication, Page } from "playwright";
 import * as utils from "../helpers/utils";
 
 describe("preferences page tests", () => {
-  let window: Page, cleanup: () => Promise<void>;
+  let window: Page;
+  let cleanup: undefined | (() => Promise<void>);
 
   beforeEach(async () => {
     let app: ElectronApplication;
@@ -23,20 +24,21 @@ describe("preferences page tests", () => {
 
     await app.evaluate(async ({ app }) => {
       await app.applicationMenu
-        .getMenuItemById(process.platform === "darwin" ? "root" : "file")
-        .submenu.getMenuItemById("preferences")
-        .click();
+        ?.getMenuItemById(process.platform === "darwin" ? "mac" : "file")
+        ?.submenu
+        ?.getMenuItemById("navigate-to-preferences")
+        ?.click();
     });
   }, 10*60*1000);
 
   afterEach(async () => {
-    await cleanup();
+    await cleanup?.();
   }, 10*60*1000);
 
   it('shows "preferences" and can navigate through the tabs', async () => {
     const pages = [
       {
-        id: "application",
+        id: "app",
         header: "Application",
       },
       {
@@ -50,8 +52,8 @@ describe("preferences page tests", () => {
     ];
 
     for (const { id, header } of pages) {
-      await window.click(`[data-testid=tab-link-for-${id}]`);
-      await window.waitForSelector(`[data-testid=${id}-header] >> text=${header}`);
+      await window.click(`[data-preference-tab-link-test=${id}]`);
+      await window.waitForSelector(`[data-preference-page-title-test] >> text=${header}`);
     }
   }, 10*60*1000);
 
diff --git a/integration/__tests__/cluster-pages.tests.ts b/integration/__tests__/cluster-pages.tests.ts
index 15e72f0d80..842a38da88 100644
--- a/integration/__tests__/cluster-pages.tests.ts
+++ b/integration/__tests__/cluster-pages.tests.ts
@@ -14,11 +14,14 @@ import { minikubeReady } from "../helpers/minikube";
 import type { Frame, Page } from "playwright";
 import { groupBy, toPairs } from "lodash/fp";
 import { pipeline } from "@ogre-tools/fp";
+import { describeIf } from "../../src/test-utils/skippers";
 
 const TEST_NAMESPACE = "integration-tests";
 
-utils.describeIf(minikubeReady(TEST_NAMESPACE))("Minikube based tests", () => {
-  let window: Page, cleanup: () => Promise<void>, frame: Frame;
+describeIf(minikubeReady(TEST_NAMESPACE))("Minikube based tests", () => {
+  let window: Page;
+  let cleanup: undefined | (() => Promise<void>);
+  let frame: Frame;
 
   beforeEach(async () => {
     ({ window, cleanup } = await utils.start());
@@ -28,7 +31,7 @@ utils.describeIf(minikubeReady(TEST_NAMESPACE))("Minikube based tests", () => {
   }, 10 * 60 * 1000);
 
   afterEach(async () => {
-    await cleanup();
+    await cleanup?.();
   }, 10 * 60 * 1000);
 
   it("shows cluster context menu in sidebar", async () => {
@@ -388,12 +391,6 @@ const scenarios = [
     sidebarItemTestId: "sidebar-item-link-for-service-accounts",
   },
 
-  {
-    expectedSelector: "h5.title",
-    parentSidebarItemTestId: "sidebar-item-link-for-user-management",
-    sidebarItemTestId: "sidebar-item-link-for-roles",
-  },
-
   {
     expectedSelector: "h5.title",
     parentSidebarItemTestId: "sidebar-item-link-for-user-management",
@@ -403,7 +400,7 @@ const scenarios = [
   {
     expectedSelector: "h5.title",
     parentSidebarItemTestId: "sidebar-item-link-for-user-management",
-    sidebarItemTestId: "sidebar-item-link-for-role-bindings",
+    sidebarItemTestId: "sidebar-item-link-for-roles",
   },
 
   {
@@ -415,7 +412,7 @@ const scenarios = [
   {
     expectedSelector: "h5.title",
     parentSidebarItemTestId: "sidebar-item-link-for-user-management",
-    sidebarItemTestId: "sidebar-item-link-for-pod-security-policies",
+    sidebarItemTestId: "sidebar-item-link-for-role-bindings",
   },
 
   {
diff --git a/integration/__tests__/command-palette.tests.ts b/integration/__tests__/command-palette.tests.ts
index 8356379b60..670a64c679 100644
--- a/integration/__tests__/command-palette.tests.ts
+++ b/integration/__tests__/command-palette.tests.ts
@@ -7,7 +7,9 @@ import type { ElectronApplication, Page } from "playwright";
 import * as utils from "../helpers/utils";
 
 describe("Lens command palette", () => {
-  let window: Page, cleanup: () => Promise<void>, app: ElectronApplication;
+  let window: Page;
+  let cleanup: undefined | (() => Promise<void>);
+  let app: ElectronApplication;
 
   beforeEach(async () => {
     ({ window, cleanup, app } = await utils.start());
@@ -15,7 +17,7 @@ describe("Lens command palette", () => {
   }, 10*60*1000);
 
   afterEach(async () => {
-    await cleanup();
+    await cleanup?.();
   }, 10*60*1000);
 
   describe("menu", () => {
@@ -23,7 +25,7 @@ describe("Lens command palette", () => {
       await app.evaluate(async ({ app }) => {
         await app.applicationMenu
           ?.getMenuItemById("view")
-          ?.submenu?.getMenuItemById("command-palette")
+          ?.submenu?.getMenuItemById("open-command-palette")
           ?.click();
       });
       await window.waitForSelector(".Select__option >> text=Hotbar: Switch");
diff --git a/integration/helpers/utils.ts b/integration/helpers/utils.ts
index f8eca46c26..02aef4f3fd 100644
--- a/integration/helpers/utils.ts
+++ b/integration/helpers/utils.ts
@@ -10,6 +10,7 @@ import * as uuid from "uuid";
 import type { ElectronApplication, Frame, Page } from "playwright";
 import { _electron as electron } from "playwright";
 import { noop } from "lodash";
+import { disposer } from "../../src/common/utils";
 
 export const appPaths: Partial<Record<NodeJS.Platform, string>> = {
   "win32": "./dist/win-unpacked/OpenLens.exe",
@@ -17,28 +18,47 @@ export const appPaths: Partial<Record<NodeJS.Platform, string>> = {
   "darwin": "./dist/mac/OpenLens.app/Contents/MacOS/OpenLens",
 };
 
-export function itIf(condition: boolean) {
-  return condition ? it : it.skip;
-}
-
-export function describeIf(condition: boolean) {
-  return condition ? describe : describe.skip;
-}
-
 async function getMainWindow(app: ElectronApplication, timeout = 50_000): Promise<Page> {
-  const deadline = Date.now() + timeout;
+  return new Promise((resolve, reject) => {
+    const cleanup = disposer();
+    let stdoutBuf = "";
+
+    const onWindow = (page: Page) => {
+      console.log(`Page opened: ${page.url()}`);
 
-  for (; Date.now() < deadline;) {
-    for (const page of app.windows()) {
       if (page.url().startsWith("http://localhost")) {
-        return page;
+        cleanup();
+        console.log(stdoutBuf);
+        resolve(page);
       }
-    }
+    };
 
-    await new Promise(resolve => setTimeout(resolve, 2_000));
-  }
+    app.on("window", onWindow);
+    cleanup.push(() => app.off("window", onWindow));
 
-  throw new Error(`Lens did not open the main window within ${timeout}ms`);
+    const onClose = () => {
+      cleanup();
+      reject(new Error("App has unnexpectedly closed"));
+    };
+
+    app.on("close", onClose);
+    cleanup.push(() => app.off("close", onClose));
+
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const stdout = app.process().stdout!;
+    const onData = (chunk: any) => stdoutBuf += chunk.toString();
+
+    stdout.on("data", onData);
+    cleanup.push(() => stdout.off("data", onData));
+
+    const timeoutId = setTimeout(() => {
+      cleanup();
+      console.log(stdoutBuf);
+      reject(new Error(`Lens did not open the main window within ${timeout}ms`));
+    }, timeout);
+
+    cleanup.push(() => clearTimeout(timeoutId));
+  });
 }
 
 async function attemptStart() {
@@ -57,7 +77,7 @@ async function attemptStart() {
       ...process.env,
     },
     timeout: 100_000,
-  } as Parameters<typeof electron["launch"]>[0]);
+  });
 
   try {
     const window = await getMainWindow(app);
diff --git a/jsonnet/lens/custom-prometheus.jsonnet b/jsonnet/lens/custom-prometheus.jsonnet
index 9c733766ba..10384fdaa5 100644
--- a/jsonnet/lens/custom-prometheus.jsonnet
+++ b/jsonnet/lens/custom-prometheus.jsonnet
@@ -24,7 +24,7 @@
       },
     },
   },
-  prometheus+:: {
+  kubernetesControlPlane+:: {
     serviceMonitorKubelet+: {
       spec+: {
         endpoints: std.map(function(endpoint)
diff --git a/package.json b/package.json
index 0613e54e2c..ff1aed0141 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "OpenLens",
   "description": "OpenLens - Open Source IDE for Kubernetes",
   "homepage": "https://github.com/lensapp/lens",
-  "version": "6.0.0",
+  "version": "6.3.0-alpha.0",
   "main": "static/build/main.js",
   "copyright": "© 2022 OpenLens Authors",
   "license": "MIT",
@@ -26,7 +26,8 @@
     "compile:main": "yarn run webpack --config webpack/main.ts",
     "compile:renderer": "yarn run webpack --config webpack/renderer.ts",
     "compile:extension-types": "yarn run webpack --config webpack/extensions.ts",
-    "npm:fix-build-version": "yarn run ts-node build/set_build_version.ts",
+    "compile:node-fetch": "yarn run webpack --config ./webpack/node-fetch.ts",
+    "postinstall": "yarn run compile:node-fetch",
     "npm:fix-package-version": "yarn run ts-node build/set_npm_version.ts",
     "build:linux": "yarn run compile && electron-builder --linux --dir",
     "build:mac": "yarn run compile && electron-builder --mac --dir",
@@ -52,11 +53,12 @@
     "create-release-pr": "node ./scripts/create-release-pr.mjs"
   },
   "config": {
-    "k8sProxyVersion": "0.2.1",
+    "k8sProxyVersion": "0.3.0",
     "bundledKubectlVersion": "1.23.3",
     "bundledHelmVersion": "3.7.2",
     "sentryDsn": "",
-    "contentSecurityPolicy": "script-src 'unsafe-eval' 'self'; frame-src http://*.localhost:*/; img-src * data:"
+    "contentSecurityPolicy": "script-src 'unsafe-eval' 'self'; frame-src http://*.localhost:*/; img-src * data:",
+    "welcomeRoute": "/welcome"
   },
   "engines": {
     "node": ">=16 <17"
@@ -216,14 +218,14 @@
     "@astronautlabs/jsonpath": "^1.1.0",
     "@hapi/call": "^9.0.0",
     "@hapi/subtext": "^7.0.4",
-    "@kubernetes/client-node": "^0.17.0",
+    "@kubernetes/client-node": "^0.17.1",
     "@material-ui/styles": "^4.11.5",
-    "@ogre-tools/fp": "10.1.0",
-    "@ogre-tools/injectable": "10.1.0",
-    "@ogre-tools/injectable-extension-for-auto-registration": "10.1.0",
-    "@ogre-tools/injectable-extension-for-mobx": "10.1.0",
-    "@ogre-tools/injectable-react": "10.1.0",
-    "@sentry/electron": "^3.0.7",
+    "@ogre-tools/fp": "^12.0.1",
+    "@ogre-tools/injectable": "^12.0.1",
+    "@ogre-tools/injectable-extension-for-auto-registration": "^12.0.1",
+    "@ogre-tools/injectable-extension-for-mobx": "^12.0.1",
+    "@ogre-tools/injectable-react": "^12.0.1",
+    "@sentry/electron": "^3.0.8",
     "@sentry/integrations": "^6.19.3",
     "@side/jest-runtime": "^1.0.1",
     "@tanstack/react-virtual": "3.0.0-beta.18",
@@ -246,43 +248,40 @@
     "handlebars": "^4.7.7",
     "history": "^4.10.1",
     "http-proxy": "^1.18.1",
-    "immer": "^9.0.15",
-    "joi": "^17.6.0",
+    "immer": "^9.0.16",
+    "joi": "^17.7.0",
     "js-yaml": "^4.1.0",
     "jsdom": "^16.7.0",
     "lodash": "^4.17.15",
-    "mac-ca": "^1.0.6",
-    "marked": "^4.1.0",
+    "marked": "^4.2.3",
     "md5-file": "^5.0.0",
-    "mobx": "^6.6.2",
+    "mobx": "^6.7.0",
     "mobx-observable-history": "^2.0.3",
-    "mobx-react": "^7.5.3",
+    "mobx-react": "^7.6.0",
     "mobx-utils": "^6.0.4",
-    "mock-fs": "^5.1.4",
+    "mock-fs": "^5.2.0",
     "moment": "^2.29.4",
-    "moment-timezone": "^0.5.37",
+    "moment-timezone": "^0.5.39",
     "monaco-editor": "^0.29.1",
     "monaco-editor-webpack-plugin": "^5.0.0",
-    "node-fetch": "^2.6.7",
+    "node-fetch": "^3.3.0",
     "node-pty": "0.10.1",
-    "npm": "^8.19.1",
+    "npm": "^8.19.3",
     "p-limit": "^3.1.0",
     "path-to-regexp": "^6.2.0",
     "proper-lockfile": "^4.1.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-material-ui-carousel": "^2.3.11",
-    "react-router": "^5.2.0",
-    "react-virtualized-auto-sizer": "^1.0.6",
+    "react-router": "^5.3.4",
+    "react-virtualized-auto-sizer": "^1.0.7",
     "readable-stream": "^3.6.0",
     "request": "^2.88.2",
     "request-promise-native": "^1.0.9",
     "rfc6902": "^4.0.2",
     "selfsigned": "^2.1.1",
-    "semver": "^7.3.7",
-    "shell-env": "^3.0.1",
-    "spdy": "^4.0.2",
-    "tar": "^6.1.11",
+    "semver": "^7.3.8",
+    "tar": "^6.1.12",
     "tcp-port-used": "^1.0.2",
     "tempy": "1.0.1",
     "typed-regex": "^0.0.8",
@@ -290,9 +289,8 @@
     "uuid": "^8.3.2",
     "win-ca": "^3.5.0",
     "winston": "^3.8.2",
-    "winston-console-format": "^1.0.8",
     "winston-transport-browserconsole": "^1.0.5",
-    "ws": "^8.8.1",
+    "ws": "^8.11.0",
     "xterm-link-provider": "^1.3.1"
   },
   "devDependencies": {
@@ -300,11 +298,11 @@
     "@material-ui/core": "^4.12.3",
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.60",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
     "@sentry/types": "^6.19.7",
     "@swc/cli": "^0.1.57",
-    "@swc/core": "^1.2.249",
-    "@swc/jest": "^0.2.22",
+    "@swc/core": "^1.3.19",
+    "@swc/jest": "^0.2.23",
     "@testing-library/dom": "^7.31.2",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.1.5",
@@ -316,7 +314,7 @@
     "@types/color": "^3.0.3",
     "@types/command-line-args": "^5.2.0",
     "@types/crypto-js": "^3.1.47",
-    "@types/dompurify": "^2.3.4",
+    "@types/dompurify": "^2.4.0",
     "@types/electron-devtools-installer": "^2.2.1",
     "@types/fs-extra": "^9.0.13",
     "@types/glob-to-regexp": "^0.4.1",
@@ -328,20 +326,19 @@
     "@types/jest": "^28.1.6",
     "@types/js-yaml": "^4.0.5",
     "@types/jsdom": "^16.2.14",
-    "@types/lodash": "^4.14.184",
+    "@types/lodash": "^4.14.190",
     "@types/marked": "^4.0.7",
     "@types/md5-file": "^4.0.2",
+    "@types/memorystream": "^0.3.0",
     "@types/mini-css-extract-plugin": "^2.4.0",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^16.11.58",
-    "@types/node-fetch": "^2.6.2",
-    "@types/npm": "^2.0.32",
+    "@types/node": "^16.18.2",
     "@types/proper-lockfile": "^4.1.2",
     "@types/randomcolor": "^0.5.6",
     "@types/react": "^17.0.45",
     "@types/react-beautiful-dnd": "^13.1.2",
     "@types/react-dom": "^17.0.16",
-    "@types/react-router": "^5.1.18",
+    "@types/react-router": "^5.1.19",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-table": "^7.7.12",
     "@types/react-virtualized-auto-sizer": "^1.0.1",
@@ -349,10 +346,9 @@
     "@types/readable-stream": "^2.3.13",
     "@types/request": "^2.48.7",
     "@types/request-promise-native": "^1.0.18",
-    "@types/semver": "^7.3.12",
-    "@types/sharp": "^0.30.5",
-    "@types/spdy": "^3.4.5",
-    "@types/tar": "^4.0.5",
+    "@types/semver": "^7.3.13",
+    "@types/sharp": "^0.31.0",
+    "@types/tar": "^6.1.3",
     "@types/tar-stream": "^2.2.2",
     "@types/tcp-port-used": "^1.0.1",
     "@types/tempy": "^0.3.0",
@@ -363,31 +359,32 @@
     "@types/webpack-dev-server": "^4.7.2",
     "@types/webpack-env": "^1.18.0",
     "@types/webpack-node-externals": "^2.5.3",
-    "@typescript-eslint/eslint-plugin": "^5.36.2",
-    "@typescript-eslint/parser": "^5.36.2",
-    "adr": "^1.4.1",
+    "@typescript-eslint/eslint-plugin": "^5.44.0",
+    "@typescript-eslint/parser": "^5.44.0",
+    "adr": "^1.4.3",
     "ansi_up": "^5.1.0",
+    "chalk": "^4.1.2",
     "chart.js": "^2.9.4",
     "circular-dependency-plugin": "^5.2.2",
     "cli-progress": "^3.11.2",
     "color": "^3.2.1",
     "command-line-args": "^5.2.1",
-    "concurrently": "^7.4.0",
-    "css-loader": "^6.7.1",
+    "concurrently": "^7.6.0",
+    "css-loader": "^6.7.2",
     "deepdash": "^5.3.9",
-    "dompurify": "^2.4.0",
-    "electron": "^19.0.16",
-    "electron-builder": "^23.3.3",
+    "dompurify": "^2.4.1",
+    "electron": "^19.1.7",
+    "electron-builder": "^23.6.0",
     "electron-notarize": "^0.3.0",
-    "esbuild": "^0.15.7",
+    "esbuild": "^0.15.15",
     "esbuild-loader": "^2.20.0",
-    "eslint": "^8.23.0",
+    "eslint": "^8.28.0",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-react": "7.31.7",
+    "eslint-plugin-react": "7.31.11",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-unused-imports": "^2.0.0",
-    "flex.box": "^3.4.4",
+    "eslint-import-resolver-typescript": "^3.5.2",
     "fork-ts-checker-webpack-plugin": "^6.5.2",
     "gunzip-maybe": "^1.4.2",
     "html-webpack-plugin": "^5.5.0",
@@ -397,44 +394,44 @@
     "jest": "^28.1.3",
     "jest-canvas-mock": "^2.3.1",
     "jest-environment-jsdom": "^28.1.3",
-    "jest-fetch-mock": "^3.0.3",
-    "jest-mock-extended": "^2.0.7",
+    "jest-mock-extended": "^2.0.9",
     "make-plural": "^6.2.2",
-    "mini-css-extract-plugin": "^2.6.1",
+    "memorystream": "^0.3.1",
+    "mini-css-extract-plugin": "^2.7.0",
     "mock-http": "^1.1.0",
     "node-gyp": "^8.3.0",
     "node-loader": "^2.0.0",
-    "nodemon": "^2.0.19",
-    "playwright": "^1.25.2",
-    "postcss": "^8.4.16",
+    "nodemon": "^2.0.20",
+    "playwright": "^1.28.1",
+    "postcss": "^8.4.19",
     "postcss-loader": "^6.2.1",
     "query-string": "^7.1.1",
     "randomcolor": "^0.6.2",
     "react-beautiful-dnd": "^13.1.1",
     "react-refresh": "^0.14.0",
     "react-refresh-typescript": "^2.0.7",
-    "react-router-dom": "^5.3.3",
-    "react-select": "^5.4.0",
+    "react-router-dom": "^5.3.4",
+    "react-select": "^5.6.1",
     "react-select-event": "^5.5.1",
     "react-table": "^7.8.0",
-    "react-window": "^1.8.7",
-    "sass": "^1.54.9",
+    "react-window": "^1.8.8",
+    "sass": "^1.56.1",
     "sass-loader": "^12.6.0",
-    "sharp": "^0.31.0",
+    "sharp": "^0.31.2",
     "style-loader": "^3.3.1",
-    "tailwindcss": "^3.1.8",
+    "tailwindcss": "^3.2.4",
     "tar-stream": "^2.2.0",
-    "ts-loader": "^9.3.1",
+    "ts-loader": "^9.4.1",
     "ts-node": "^10.9.1",
     "type-fest": "^2.14.0",
     "typed-emitter": "^1.4.0",
-    "typedoc": "0.23.14",
-    "typedoc-plugin-markdown": "^3.13.1",
-    "typescript": "^4.8.2",
+    "typedoc": "0.23.21",
+    "typedoc-plugin-markdown": "^3.13.6",
+    "typescript": "^4.9.3",
     "typescript-plugin-css-modules": "^3.4.0",
-    "webpack": "^5.74.0",
+    "webpack": "^5.75.0",
     "webpack-cli": "^4.9.2",
-    "webpack-dev-server": "^4.11.0",
+    "webpack-dev-server": "^4.11.1",
     "webpack-node-externals": "^3.0.0",
     "xterm": "^4.19.0",
     "xterm-addon-fit": "^0.5.0"
diff --git a/scripts/create-release-pr.ts b/scripts/create-release-pr.ts
index da0d5d4f26..202f340969 100755
--- a/scripts/create-release-pr.ts
+++ b/scripts/create-release-pr.ts
@@ -8,7 +8,7 @@ import fse from "fs-extra";
 import { basename } from "path";
 import { createInterface } from "readline";
 import semver from "semver";
-import { inspect, promisify } from "util";
+import { promisify } from "util";
 
 const {
   SemVer,
@@ -27,6 +27,10 @@ const options = commandLineArgs([
   {
     name: "preid",
   },
+  {
+    name: "check-commits",
+    type: Boolean,
+  },
 ]);
 
 const validReleaseValues = [
@@ -79,10 +83,22 @@ if (basename(process.cwd()) === "scripts") {
   console.error(errorMessages.wrongCwd);
 }
 
-
-const currentVersion = new SemVer((await fse.readJson("./package.json")).version);
+const packageJson = await fse.readJson("./package.json");
+const currentVersion = new SemVer(packageJson.version);
 
 console.log(`current version: ${currentVersion.format()}`);
+
+const newVersion = currentVersion.inc(options.type, options.preid);
+const newVersionMilestone = `${newVersion.major}.${newVersion.minor}.${newVersion.patch}`;
+const prBranch = `release/v${newVersion.format()}`;
+
+await fse.writeJson("./package.json", { ...packageJson, version: newVersion.format() }, { spaces: 2 });
+await exec(`git checkout -b ${prBranch}`);
+await exec("git add package.json");
+await exec(`git commit -sm "Release ${newVersion.format()}"`);
+
+console.log(`new version: ${newVersion.format()}`);
+
 console.log("fetching tags...");
 await exec("git fetch --tags --force");
 
@@ -93,25 +109,6 @@ const [previousReleasedVersion] = actualTags
   .sort((l, r) => semverRcompare(l, r))
   .filter(version => semverLte(version, currentVersion));
 
-const npmVersionArgs = [
-  "npm",
-  "version",
-  options.type,
-];
-
-if (options.preid) {
-  npmVersionArgs.push(`--preid=${options.preid}`);
-}
-
-npmVersionArgs.push("--git-tag-version false");
-
-await exec(npmVersionArgs.join(" "));
-
-const newVersion = new SemVer((await fse.readJson("./package.json")).version);
-const newVersionMilestone = `${newVersion.major}.${newVersion.minor}.${newVersion.patch}`;
-
-console.log(`new version: ${newVersion.format()}`);
-
 const getMergedPrsArgs = [
   "gh",
   "pr",
@@ -146,6 +143,10 @@ interface GithubPrData {
   title: string;
 }
 
+interface ExtendedGithubPrData extends Omit<GithubPrData, "mergedAt"> {
+  mergedAt: Date;
+}
+
 console.log("retreiving last 500 PRs to create release PR body...");
 const mergedPrs = JSON.parse((await exec(getMergedPrsArgs.join(" "), { encoding: "utf-8" })).stdout) as GithubPrData[];
 const milestoneRelevantPrs = mergedPrs.filter(pr => pr.milestone?.title === newVersionMilestone);
@@ -159,7 +160,7 @@ const relaventPrs = relaventPrsQuery
   .filter(query => query.stdout)
   .map(query => query.pr)
   .filter(pr => pr.labels.every(label => label.name !== "skip-changelog"))
-  .map(pr => ({ ...pr, mergedAt: new Date(pr.mergedAt) }))
+  .map(pr => ({ ...pr, mergedAt: new Date(pr.mergedAt) } as ExtendedGithubPrData))
   .sort((left, right) => {
     const leftAge = left.mergedAt.valueOf();
     const rightAge = right.mergedAt.valueOf();
@@ -175,75 +176,55 @@ const relaventPrs = relaventPrsQuery
     return -1;
   });
 
-console.log(inspect(relaventPrs, false, null, true));
-
 const enhancementPrLabelName = "enhancement";
 const bugfixPrLabelName = "bug";
 
-const enhancementPrs = relaventPrs.filter(pr => pr.labels.some(label => label.name === enhancementPrLabelName));
-const bugfixPrs = relaventPrs.filter(pr => pr.labels.some(label => label.name === bugfixPrLabelName));
-const maintenencePrs = relaventPrs.filter(pr => pr.labels.every(label => label.name !== bugfixPrLabelName && label.name !== enhancementPrLabelName));
+const isEnhancementPr = (pr: ExtendedGithubPrData) => pr.labels.some(label => label.name === enhancementPrLabelName);
+const isBugfixPr = (pr: ExtendedGithubPrData) => pr.labels.some(label => label.name === bugfixPrLabelName);
 
-console.log("Found:");
-console.log(`${enhancementPrs.length} enhancement PRs`);
-console.log(`${bugfixPrs.length} bug fix PRs`);
-console.log(`${maintenencePrs.length} maintenence PRs`);
+const prLines = {
+  enhancement: [] as string[],
+  bugfix: [] as string[],
+  maintenence: [] as string[],
+};
 
-const prBodyLines = [
-  `## Changes since ${previousReleasedVersion}`,
-  "",
-];
-
-function getPrEntry(pr) {
+function getPrEntry(pr: ExtendedGithubPrData) {
   return `- ${pr.title} (**[#${pr.number}](https://github.com/lensapp/lens/pull/${pr.number})**) https://github.com/${pr.author.login}`;
 }
 
-if (enhancementPrs.length > 0) {
-  prBodyLines.push(
-    "## 🚀 Features",
-    "",
-    ...enhancementPrs.map(getPrEntry),
-    "",
-  );
-}
-
-if (bugfixPrs.length > 0) {
-  prBodyLines.push(
-    "## 🐛 Bug Fixes",
-    "",
-    ...bugfixPrs.map(getPrEntry),
-    "",
-  );
-}
-
-if (maintenencePrs.length > 0) {
-  prBodyLines.push(
-    "## 🧰 Maintenance",
-    "",
-    ...maintenencePrs.map(getPrEntry),
-    "",
-  );
-}
-
-const prBody = prBodyLines.join("\n");
+const rl = createInterface(process.stdin);
 const prBase = newVersion.patch === 0
   ? "master"
   : `release/v${newVersion.major}.${newVersion.minor}`;
-const createPrArgs = [
-  "pr",
-  "create",
-  "--base", prBase,
-  "--title", `release ${newVersion.format()}`,
-  "--label", "skip-changelog",
-  "--body-file", "-",
-];
 
-const rl = createInterface(process.stdin);
+function askQuestion(question: string): Promise<boolean> {
+  return new Promise<boolean>(resolve => {
+    function _askQuestion() {
+      console.log(question);
 
-if (prBase !== "master") {
-  console.log("Cherry-picking commits to current branch");
+      rl.once("line", (answer) => {
+        const cleaned = answer.trim().toLowerCase();
 
-  for (const pr of relaventPrs) {
+        if (cleaned === "y") {
+          resolve(true);
+        } else if (cleaned === "n") {
+          resolve(false);
+        } else {
+          _askQuestion();
+        }
+      });
+    }
+
+    _askQuestion();
+  });
+}
+
+async function handleRelaventPr(pr: ExtendedGithubPrData) {
+  if (options["check-commits"] && !(await askQuestion(`Would you like to use #${pr.number}: ${pr.title}? - Y/N`))) {
+    return;
+  }
+
+  if (prBase !== "master") {
     try {
       const promise = exec(`git cherry-pick ${pr.mergeCommit.oid}`);
 
@@ -255,11 +236,72 @@ if (prBase !== "master") {
       await promise;
     } catch {
       console.error(`Failed to cherry-pick ${pr.mergeCommit.oid}, please resolve conflicts and then press enter here:`);
-      await new Promise<void>(resolve => rl.on("line", () => resolve()));
+      await new Promise<void>(resolve => rl.once("line", () => resolve()));
     }
   }
+
+  if (isEnhancementPr(pr)) {
+    prLines.enhancement.push(getPrEntry(pr));
+  } else if (isBugfixPr(pr)) {
+    prLines.bugfix.push(getPrEntry(pr));
+  } else {
+    prLines.maintenence.push(getPrEntry(pr));
+  }
 }
 
+for (const pr of relaventPrs) {
+  await handleRelaventPr(pr);
+}
+
+rl.close();
+
+const prBodyLines = [
+  `## Changes since ${previousReleasedVersion}`,
+  "",
+  ...(
+    prLines.enhancement.length > 0
+      ? [
+        "## 🚀 Features",
+        "",
+        ...prLines.enhancement,
+        "",
+      ]
+      : []
+  ),
+  ...(
+    prLines.bugfix.length > 0
+      ? [
+        "## 🐛 Bug Fixes",
+        "",
+        ...prLines.bugfix,
+        "",
+      ]
+      : []
+  ),
+  ...(
+    prLines.maintenence.length > 0
+      ? [
+        "## 🧰 Maintenance",
+        "",
+        ...prLines.maintenence,
+        "",
+      ]
+      : []
+  ),
+];
+const prBody = prBodyLines.join("\n");
+const createPrArgs = [
+  "pr",
+  "create",
+  "--base", prBase,
+  "--title", `Release ${newVersion.format()}`,
+  "--label", "skip-changelog",
+  "--label", "release",
+  "--body-file", "-",
+];
+
+await exec(`git push --set-upstream origin ${prBranch}`);
+
 const createPrProcess = execFile("gh", createPrArgs);
 
 createPrProcess.child.stdout?.pipe(process.stdout);
diff --git a/scripts/tag-release.sh b/scripts/tag-release.sh
deleted file mode 100755
index ce2ddffb2b..0000000000
--- a/scripts/tag-release.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-while [[ $# -gt 0 ]]; do
-  key="$1"
-
-  case $key in
-    -f|--force)
-      FORCE="--force"
-      shift # past argument
-      ;;
-  esac
-done
-
-if [[ `git branch --show-current` =~ ^release/v ]]
-then
-  VERSION_STRING=$(cat package.json | jq '.version' -r | xargs printf "v%s")
-  git tag ${VERSION_STRING} ${FORCE}
-  git push ${GIT_REMOTE:-origin} ${VERSION_STRING} ${FORCE}
-else
-  echo "You must be in a release branch"
-fi
diff --git a/src/common/__tests__/cluster-store.test.ts b/src/common/__tests__/cluster-store.test.ts
index b74659aea0..2253c7662f 100644
--- a/src/common/__tests__/cluster-store.test.ts
+++ b/src/common/__tests__/cluster-store.test.ts
@@ -18,13 +18,13 @@ import { createClusterInjectionToken } from "../cluster/create-cluster-injection
 import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
 import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable";
-import appVersionInjectable from "../vars/app-version.injectable";
 import assert from "assert";
 import directoryForTempInjectable from "../app-paths/directory-for-temp/directory-for-temp.injectable";
 import kubectlBinaryNameInjectable from "../../main/kubectl/binary-name.injectable";
 import kubectlDownloadingNormalizedArchInjectable from "../../main/kubectl/normalized-arch.injectable";
 import normalizedPlatformInjectable from "../vars/normalized-platform.injectable";
 import fsInjectable from "../fs/fs.injectable";
+import storeMigrationVersionInjectable from "../vars/store-migration-version.injectable";
 
 console = new Console(stdout, stderr);
 
@@ -372,7 +372,7 @@ users:
 
       mockFs(mockOpts);
 
-      mainDi.override(appVersionInjectable, () => "3.6.0");
+      mainDi.override(storeMigrationVersionInjectable, () => "3.6.0");
 
       createCluster = mainDi.inject(createClusterInjectionToken);
 
diff --git a/src/common/__tests__/event-bus.test.ts b/src/common/__tests__/event-bus.test.ts
deleted file mode 100644
index f90381eb44..0000000000
--- a/src/common/__tests__/event-bus.test.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { AppEvent } from "../app-event-bus/event-bus";
-import { appEventBus } from "../app-event-bus/event-bus";
-import { assert, Console } from "console";
-import { stdout, stderr } from "process";
-
-console = new Console(stdout, stderr);
-
-describe("event bus tests", () => {
-  describe("emit", () => {
-    it("emits an event", () => {
-      let event: AppEvent | undefined;
-
-      appEventBus.addListener((data) => {
-        event = data;
-      });
-
-      appEventBus.emit({ name: "foo", action: "bar" });
-      assert(event);
-      expect(event?.name).toBe("foo");
-    });
-  });
-});
diff --git a/src/common/__tests__/hotbar-store.test.ts b/src/common/__tests__/hotbar-store.test.ts
index d847ac76dc..0e1b3e27a2 100644
--- a/src/common/__tests__/hotbar-store.test.ts
+++ b/src/common/__tests__/hotbar-store.test.ts
@@ -8,7 +8,6 @@ import mockFs from "mock-fs";
 import type { CatalogEntity, CatalogEntityData, CatalogEntityKindData } from "../catalog";
 import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
 import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable";
-import appVersionInjectable from "../vars/app-version.injectable";
 import type { DiContainer } from "@ogre-tools/injectable";
 import hotbarStoreInjectable from "../hotbars/store.injectable";
 import type { HotbarStore } from "../hotbars/store";
@@ -19,6 +18,7 @@ import catalogCatalogEntityInjectable from "../catalog-entities/general-catalog-
 import loggerInjectable from "../logger.injectable";
 import type { Logger } from "../logger";
 import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import storeMigrationVersionInjectable from "../vars/store-migration-version.injectable";
 
 function getMockCatalogEntity(data: Partial<CatalogEntityData> & CatalogEntityKindData): CatalogEntity {
   return {
@@ -348,7 +348,7 @@ describe("HotbarStore", () => {
 
       mockFs(configurationToBeMigrated);
 
-      di.override(appVersionInjectable, () => "5.0.0-beta.10");
+      di.override(storeMigrationVersionInjectable, () => "5.0.0-beta.10");
 
       hotbarStore = di.inject(hotbarStoreInjectable);
 
diff --git a/src/common/__tests__/system-ca.test.ts b/src/common/__tests__/system-ca.test.ts
deleted file mode 100644
index 473fe6ed57..0000000000
--- a/src/common/__tests__/system-ca.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import https from "https";
-import os from "os";
-import { getMacRootCA, getWinRootCA, injectCAs, DSTRootCAX3 } from "../system-ca";
-import { dependencies, devDependencies } from "../../../package.json";
-import assert from "assert";
-
-const deps = { ...dependencies, ...devDependencies };
-
-// Skip the test if mac-ca is not installed, or os is not darwin
-(deps["mac-ca"] && os.platform().includes("darwin") ? describe: describe.skip)("inject CA for Mac", () => {
-  // for reset https.globalAgent.options.ca after testing
-  let _ca: string | Buffer | (string | Buffer)[] | undefined;
-
-  beforeEach(() => {
-    _ca = https.globalAgent.options.ca;
-  });
-
-  afterEach(() => {
-    https.globalAgent.options.ca = _ca;
-  });
-
-  /**
-   * The test to ensure using getMacRootCA + injectCAs injects CAs in the same way as using
-   * the auto injection (require('mac-ca'))
-   */
-  it("should inject the same ca as mac-ca", async () => {
-    const osxCAs = await getMacRootCA();
-
-    injectCAs(osxCAs);
-    const injected = https.globalAgent.options.ca as (string | Buffer)[];
-
-    await import("mac-ca");
-    const injectedByMacCA = https.globalAgent.options.ca as (string | Buffer)[];
-
-    expect(new Set(injected)).toEqual(new Set(injectedByMacCA));
-  });
-
-  it("shouldn't included the expired DST Root CA X3 on Mac", async () => {
-    const osxCAs = await getMacRootCA();
-
-    injectCAs(osxCAs);
-    const injected = https.globalAgent.options.ca;
-
-    assert(injected);
-    expect(injected.includes(DSTRootCAX3)).toBeFalsy();
-  });
-});
-
-// Skip the test if win-ca is not installed, or os is not win32
-(deps["win-ca"] && os.platform().includes("win32") ? describe: describe.skip)("inject CA for Windows", () => {
-  // for reset https.globalAgent.options.ca after testing
-  let _ca: string | Buffer | (string | Buffer)[] | undefined;
-
-  beforeEach(() => {
-    _ca = https.globalAgent.options.ca;
-  });
-
-  afterEach(() => {
-    https.globalAgent.options.ca = _ca;
-  });
-
-  /**
-   * The test to ensure using win-ca/api injects CAs in the same way as using
-   * the auto injection (require('win-ca').inject('+'))
-   */
-  it("should inject the same ca as winca.inject('+')", async () => {
-    const winCAs = await getWinRootCA();
-
-    const wincaAPI = await import("win-ca/api");
-
-    wincaAPI.inject("+", winCAs);
-    const injected = https.globalAgent.options.ca as (string | Buffer)[];
-
-    const winca = await import("win-ca");
-
-    winca.inject("+"); // see: https://github.com/ukoloff/win-ca#caveats
-    const injectedByWinCA = https.globalAgent.options.ca as (string | Buffer)[];
-
-    expect(new Set(injected)).toEqual(new Set(injectedByWinCA));
-  });
-
-  it("shouldn't included the expired DST Root CA X3 on Windows", async () => {
-    const winCAs = await getWinRootCA();
-
-    const wincaAPI = await import("win-ca/api");
-
-    wincaAPI.inject("true", winCAs);
-    const injected = https.globalAgent.options.ca as (string | Buffer)[];
-
-    expect(injected.includes(DSTRootCAX3)).toBeFalsy();
-  });
-});
-
-
-
diff --git a/src/common/__tests__/user-store.test.ts b/src/common/__tests__/user-store.test.ts
index 23740c5457..eeadbc1e6c 100644
--- a/src/common/__tests__/user-store.test.ts
+++ b/src/common/__tests__/user-store.test.ts
@@ -23,8 +23,6 @@ jest.mock("electron", () => ({
 
 import type { UserStore } from "../user-store";
 import { Console } from "console";
-import { SemVer } from "semver";
-import electron from "electron";
 import { stdout, stderr } from "process";
 import userStoreInjectable from "../user-store/user-store.injectable";
 import type { DiContainer } from "@ogre-tools/injectable";
@@ -34,7 +32,9 @@ import { defaultThemeId } from "../vars";
 import writeFileInjectable from "../fs/write-file.injectable";
 import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
 import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable";
-import appVersionInjectable from "../vars/app-version.injectable";
+import storeMigrationVersionInjectable from "../vars/store-migration-version.injectable";
+import releaseChannelInjectable from "../vars/release-channel.injectable";
+import defaultUpdateChannelInjectable from "../../features/application-update/common/selected-update-channel/default-update-channel.injectable";
 
 console = new Console(stdout, stderr);
 
@@ -42,7 +42,7 @@ describe("user store tests", () => {
   let userStore: UserStore;
   let di: DiContainer;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     di = getDiForUnitTesting({ doGeneralOverrides: true });
 
     mockFs();
@@ -52,6 +52,12 @@ describe("user store tests", () => {
     di.permitSideEffects(getConfigurationFileModelInjectable);
     di.permitSideEffects(userStoreInjectable);
 
+    di.override(releaseChannelInjectable, () => ({
+      get: () => "latest" as const,
+      init: async () => {},
+    }));
+    await di.inject(defaultUpdateChannelInjectable).init();
+
     di.unoverride(userStoreInjectable);
   });
 
@@ -64,6 +70,7 @@ describe("user store tests", () => {
       mockFs({ "some-directory-for-user-data": { "config.json": "{}", "kube_config": "{}" }});
 
       userStore = di.inject(userStoreInjectable);
+      userStore.load();
     });
 
     it("allows setting and retrieving lastSeenAppVersion", () => {
@@ -86,13 +93,6 @@ describe("user store tests", () => {
       userStore.resetTheme();
       expect(userStore.colorTheme).toBe(defaultThemeId);
     });
-
-    it("correctly calculates if the last seen version is an old release", () => {
-      expect(userStore.isNewVersion).toBe(true);
-
-      userStore.lastSeenAppVersion = (new SemVer(electron.app.getVersion())).inc("major").format();
-      expect(userStore.isNewVersion).toBe(false);
-    });
   });
 
   describe("migrations", () => {
@@ -125,9 +125,10 @@ describe("user store tests", () => {
         },
       });
 
-      di.override(appVersionInjectable, () => "10.0.0");
+      di.override(storeMigrationVersionInjectable, () => "10.0.0");
 
       userStore = di.inject(userStoreInjectable);
+      userStore.load();
     });
 
     it("sets last seen app version to 0.0.0", () => {
diff --git a/src/common/app-event-bus/app-event-bus.injectable.ts b/src/common/app-event-bus/app-event-bus.injectable.ts
index d707ec9fc3..3dee975f7b 100644
--- a/src/common/app-event-bus/app-event-bus.injectable.ts
+++ b/src/common/app-event-bus/app-event-bus.injectable.ts
@@ -3,12 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { appEventBus } from "./event-bus";
+import { EventEmitter } from "../event-emitter";
+import type { AppEvent } from "./event-bus";
 
 const appEventBusInjectable = getInjectable({
   id: "app-event-bus",
-  instantiate: () => appEventBus,
-  causesSideEffects: true,
+  instantiate: () => new EventEmitter<[AppEvent]>,
   decorable: false,
 });
 
diff --git a/src/common/app-event-bus/emit-event.injectable.ts b/src/common/app-event-bus/emit-event.injectable.ts
index d5aaafe37b..9c9194ceb8 100644
--- a/src/common/app-event-bus/emit-event.injectable.ts
+++ b/src/common/app-event-bus/emit-event.injectable.ts
@@ -4,11 +4,18 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import appEventBusInjectable from "./app-event-bus.injectable";
+import type { AppEvent } from "./event-bus";
 
-const emitEventInjectable = getInjectable({
-  id: "emit-event",
-  instantiate: (di) => di.inject(appEventBusInjectable).emit,
+export type EmitAppEvent = (event: AppEvent) => void;
+
+const emitAppEventInjectable = getInjectable({
+  id: "emit-app-event",
+  instantiate: (di): EmitAppEvent => {
+    const bus = di.inject(appEventBusInjectable);
+
+    return (event) => bus.emit(event);
+  },
   decorable: false,
 });
 
-export default emitEventInjectable;
+export default emitAppEventInjectable;
diff --git a/src/common/app-event-bus/event-bus.ts b/src/common/app-event-bus/event-bus.ts
index 67d23587c7..d121b842f7 100644
--- a/src/common/app-event-bus/event-bus.ts
+++ b/src/common/app-event-bus/event-bus.ts
@@ -3,13 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { EventEmitter } from "../event-emitter";
-
+/**
+ * Data for telemetry
+ */
 export interface AppEvent {
   name: string;
   action: string;
   destination?: string;
   params?: Record<string, any>;
 }
-
-export const appEventBus = new EventEmitter<[AppEvent]>();
diff --git a/src/common/app-paths/app-paths-channel.injectable.ts b/src/common/app-paths/app-paths-channel.injectable.ts
deleted file mode 100644
index 99fc738b41..0000000000
--- a/src/common/app-paths/app-paths-channel.injectable.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { AppPaths } from "./app-path-injection-token";
-import type { RequestChannel } from "../utils/channel/request-channel-injection-token";
-import { messageChannelInjectionToken } from "../utils/channel/message-channel-injection-token";
-
-export type AppPathsChannel = RequestChannel<void, AppPaths>;
-
-const appPathsChannelInjectable = getInjectable({
-  id: "app-paths-channel",
-
-  instantiate: (): AppPathsChannel => ({
-    id: "app-paths",
-  }),
-
-  injectionToken: messageChannelInjectionToken,
-});
-
-export default appPathsChannelInjectable;
diff --git a/src/common/app-paths/app-paths-channel.ts b/src/common/app-paths/app-paths-channel.ts
new file mode 100644
index 0000000000..4502569d3b
--- /dev/null
+++ b/src/common/app-paths/app-paths-channel.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { AppPaths } from "./app-path-injection-token";
+import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+
+export type AppPathsChannel = RequestChannel<void, AppPaths>;
+
+export const appPathsChannel: AppPathsChannel = {
+  id: "app-paths",
+};
+
diff --git a/src/common/app-paths/app-paths.test.ts b/src/common/app-paths/app-paths.test.ts
index b5ec33059c..ff4bd88988 100644
--- a/src/common/app-paths/app-paths.test.ts
+++ b/src/common/app-paths/app-paths.test.ts
@@ -7,7 +7,6 @@ import { appPathsInjectionToken } from "./app-path-injection-token";
 import getElectronAppPathInjectable from "../../main/app-paths/get-electron-app-path/get-electron-app-path.injectable";
 import type { PathName } from "./app-path-names";
 import setElectronAppPathInjectable from "../../main/app-paths/set-electron-app-path/set-electron-app-path.injectable";
-import appNameInjectable from "../../main/app-paths/app-name/app-name.injectable";
 import directoryForIntegrationTestingInjectable from "../../main/app-paths/directory-for-integration-testing/directory-for-integration-testing.injectable";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
@@ -53,8 +52,6 @@ describe("app-paths", () => {
             defaultAppPathsStub[key] = path;
           },
       );
-
-      mainDi.override(appNameInjectable, () => "some-app-name");
     });
   });
 
@@ -88,7 +85,7 @@ describe("app-paths", () => {
         recent: "some-recent",
         temp: "some-temp",
         videos: "some-videos",
-        userData: "some-app-data/some-app-name",
+        userData: "some-app-data/some-product-name",
       });
     });
 
@@ -111,7 +108,7 @@ describe("app-paths", () => {
         recent: "some-recent",
         temp: "some-temp",
         videos: "some-videos",
-        userData: "some-app-data/some-app-name",
+        userData: "some-app-data/some-product-name",
       });
     });
   });
@@ -137,7 +134,7 @@ describe("app-paths", () => {
 
       expect({ appData, userData }).toEqual({
         appData: "some-integration-testing-app-data",
-        userData: `some-integration-testing-app-data/some-app-name`,
+        userData: `some-integration-testing-app-data/some-product-name`,
       });
     });
 
@@ -146,7 +143,7 @@ describe("app-paths", () => {
 
       expect({ appData, userData }).toEqual({
         appData: "some-integration-testing-app-data",
-        userData: "some-integration-testing-app-data/some-app-name",
+        userData: "some-integration-testing-app-data/some-product-name",
       });
     });
   });
diff --git a/src/common/app-paths/directory-for-binaries/directory-for-binaries.injectable.ts b/src/common/app-paths/directory-for-binaries/directory-for-binaries.injectable.ts
index 5f6b14f5ba..f8a55b041c 100644
--- a/src/common/app-paths/directory-for-binaries/directory-for-binaries.injectable.ts
+++ b/src/common/app-paths/directory-for-binaries/directory-for-binaries.injectable.ts
@@ -4,16 +4,16 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import directoryForUserDataInjectable from "../directory-for-user-data/directory-for-user-data.injectable";
-import getAbsolutePathInjectable from "../../path/get-absolute-path.injectable";
+import joinPathsInjectable from "../../path/join-paths.injectable";
 
 const directoryForBinariesInjectable = getInjectable({
   id: "directory-for-binaries",
 
   instantiate: (di) => {
-    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
     const directoryForUserData = di.inject(directoryForUserDataInjectable);
 
-    return getAbsolutePath(directoryForUserData, "binaries");
+    return joinPaths(directoryForUserData, "binaries");
   },
 });
 
diff --git a/src/common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable.ts b/src/common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable.ts
index f371860f18..d49029572e 100644
--- a/src/common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable.ts
+++ b/src/common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable.ts
@@ -4,19 +4,16 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import directoryForUserDataInjectable from "../directory-for-user-data/directory-for-user-data.injectable";
-import getAbsolutePathInjectable from "../../path/get-absolute-path.injectable";
+import joinPathsInjectable from "../../path/join-paths.injectable";
 
 const directoryForKubeConfigsInjectable = getInjectable({
   id: "directory-for-kube-configs",
 
   instantiate: (di) => {
-    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
     const directoryForUserData = di.inject(directoryForUserDataInjectable);
 
-    return getAbsolutePath(
-      directoryForUserData,
-      "kubeconfigs",
-    );
+    return joinPaths(directoryForUserData, "kubeconfigs");
   },
 });
 
diff --git a/src/common/app-paths/directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable.ts b/src/common/app-paths/directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable.ts
index 4b6ce56601..c1ef1b23f5 100644
--- a/src/common/app-paths/directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable.ts
+++ b/src/common/app-paths/directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable.ts
@@ -4,17 +4,16 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import directoryForBinariesInjectable from "../directory-for-binaries/directory-for-binaries.injectable";
-import getAbsolutePathInjectable from "../../path/get-absolute-path.injectable";
+import joinPathsInjectable from "../../path/join-paths.injectable";
 
 const directoryForKubectlBinariesInjectable = getInjectable({
   id: "directory-for-kubectl-binaries",
 
   instantiate: (di) => {
-    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
     const directoryForBinaries = di.inject(directoryForBinariesInjectable);
 
-
-    return getAbsolutePath(directoryForBinaries, "kubectl");
+    return joinPaths(directoryForBinaries, "kubectl");
   },
 });
 
diff --git a/src/common/app-paths/directory-for-logs.injectable.ts b/src/common/app-paths/directory-for-logs.injectable.ts
new file mode 100644
index 0000000000..e9abc35c44
--- /dev/null
+++ b/src/common/app-paths/directory-for-logs.injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import appPathsInjectable from "./app-paths.injectable";
+
+const directoryForLogsInjectable = getInjectable({
+  id: "directory-for-logs",
+  instantiate: (di) => di.inject(appPathsInjectable).logs,
+});
+
+export default directoryForLogsInjectable;
diff --git a/src/common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable.ts b/src/common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable.ts
index 6f22aa32f2..5d53e506bd 100644
--- a/src/common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable.ts
+++ b/src/common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable.ts
@@ -4,17 +4,16 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import directoryForKubeConfigsInjectable from "../directory-for-kube-configs/directory-for-kube-configs.injectable";
-import getAbsolutePathInjectable from "../../path/get-absolute-path.injectable";
+import joinPathsInjectable from "../../path/join-paths.injectable";
 
 const getCustomKubeConfigDirectoryInjectable = getInjectable({
   id: "get-custom-kube-config-directory",
 
   instantiate: (di) => {
     const directoryForKubeConfigs = di.inject(directoryForKubeConfigsInjectable);
-    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
 
-    return (directoryName: string) =>
-      getAbsolutePath(directoryForKubeConfigs, directoryName);
+    return (directoryName: string) => joinPaths(directoryForKubeConfigs, directoryName);
   },
 });
 
diff --git a/src/common/application-update/restart-and-install-update-channel/restart-and-install-update-channel.injectable.ts b/src/common/application-update/restart-and-install-update-channel/restart-and-install-update-channel.injectable.ts
deleted file mode 100644
index b6d811e101..0000000000
--- a/src/common/application-update/restart-and-install-update-channel/restart-and-install-update-channel.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { MessageChannel } from "../../utils/channel/message-channel-injection-token";
-import { messageChannelInjectionToken } from "../../utils/channel/message-channel-injection-token";
-
-export type RestartAndInstallUpdateChannel = MessageChannel;
-
-const restartAndInstallUpdateChannel = getInjectable({
-  id: "restart-and-install-update-channel",
-
-  instantiate: (): RestartAndInstallUpdateChannel => ({
-    id: "restart-and-install-update-channel",
-  }),
-
-  injectionToken: messageChannelInjectionToken,
-});
-
-export default restartAndInstallUpdateChannel;
diff --git a/src/common/application-update/selected-update-channel/default-update-channel.injectable.ts b/src/common/application-update/selected-update-channel/default-update-channel.injectable.ts
deleted file mode 100644
index 90dc22457a..0000000000
--- a/src/common/application-update/selected-update-channel/default-update-channel.injectable.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import appSemanticVersionInjectable from "../../vars/app-semantic-version.injectable";
-import type { UpdateChannelId } from "../update-channels";
-import { updateChannels } from "../update-channels";
-
-const defaultUpdateChannelInjectable = getInjectable({
-  id: "default-update-channel",
-
-  instantiate: (di) => {
-    const appSemanticVersion = di.inject(appSemanticVersionInjectable);
-    const currentReleaseChannel = appSemanticVersion.prerelease[0]?.toString();
-
-    if (currentReleaseChannel in updateChannels) {
-      return updateChannels[currentReleaseChannel as UpdateChannelId];
-    }
-
-    return updateChannels.latest;
-  },
-});
-
-export default defaultUpdateChannelInjectable;
diff --git a/src/common/base-store.ts b/src/common/base-store.ts
index 2c2f66dd23..92383b328d 100644
--- a/src/common/base-store.ts
+++ b/src/common/base-store.ts
@@ -19,7 +19,7 @@ import { kebabCase } from "lodash";
 import { getLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import directoryForUserDataInjectable from "./app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import getConfigurationFileModelInjectable from "./get-configuration-file-model/get-configuration-file-model.injectable";
-import appVersionInjectable from "./vars/app-version.injectable";
+import storeMigrationVersionInjectable from "./vars/store-migration-version.injectable";
 
 export interface BaseStoreParams<T> extends ConfOptions<T> {
   syncOptions?: {
@@ -60,7 +60,7 @@ export abstract class BaseStore<T extends object> extends Singleton {
 
     this.storeConfig = getConfigurationFileModel({
       projectName: "lens",
-      projectVersion: di.inject(appVersionInjectable),
+      projectVersion: di.inject(storeMigrationVersionInjectable),
       cwd: this.cwd(),
       ...this.params,
     });
diff --git a/src/common/catalog-entities/web-link.ts b/src/common/catalog-entities/web-link.ts
index 35dc86be57..dade63af16 100644
--- a/src/common/catalog-entities/web-link.ts
+++ b/src/common/catalog-entities/web-link.ts
@@ -3,9 +3,10 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
+import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import type { CatalogEntityContextMenuContext, CatalogEntityMetadata, CatalogEntityStatus } from "../catalog";
 import { CatalogCategory, CatalogEntity, categoryVersion } from "../catalog/catalog-entity";
-import { productName } from "../vars";
+import productNameInjectable from "../vars/product-name.injectable";
 import { WeblinkStore } from "../weblink-store";
 
 export type WebLinkStatusPhase = "available" | "unavailable";
@@ -30,6 +31,9 @@ export class WebLink extends CatalogEntity<CatalogEntityMetadata, WebLinkStatus,
   }
 
   onContextMenuOpen(context: CatalogEntityContextMenuContext) {
+    const di = getLegacyGlobalDiForExtensionApi();
+    const productName = di.inject(productNameInjectable);
+
     if (this.metadata.source === "local") {
       context.menuItems.push({
         title: "Delete",
diff --git a/src/common/catalog/filtered-categories.injectable.ts b/src/common/catalog/filtered-categories.injectable.ts
new file mode 100644
index 0000000000..c84d527ff2
--- /dev/null
+++ b/src/common/catalog/filtered-categories.injectable.ts
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import catalogCategoryRegistryInjectable from "./category-registry.injectable";
+
+const filteredCategoriesInjectable = getInjectable({
+  id: "filtered-categories",
+  instantiate: (di) => {
+    const registry = di.inject(catalogCategoryRegistryInjectable);
+
+    return computed(() => [...registry.filteredItems]);
+  },
+});
+
+export default filteredCategoriesInjectable;
diff --git a/src/common/certificate-authorities/inject-system-cas.injectable.ts b/src/common/certificate-authorities/inject-system-cas.injectable.ts
new file mode 100644
index 0000000000..f75dcd6c70
--- /dev/null
+++ b/src/common/certificate-authorities/inject-system-cas.injectable.ts
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectable } from "@ogre-tools/injectable";
+import { globalAgent } from "https";
+import { requestSystemCAsInjectionToken } from "./request-system-cas-token";
+
+// DST Root CA X3, which was expired on 9.30.2021
+const DSTRootCAX3 = "-----BEGIN CERTIFICATE-----\nMIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/\nMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT\nDkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow\nPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD\nEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB\nAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O\nrz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq\nOLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b\nxiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw\n7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD\naeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV\nHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG\nSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69\nikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr\nAvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz\nR8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5\nJDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo\nOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ\n-----END CERTIFICATE-----\n";
+
+function isCertActive(cert: string) {
+  const isExpired = typeof cert !== "string" || cert.includes(DSTRootCAX3);
+
+  return !isExpired;
+}
+
+const injectSystemCAsInjectable = getInjectable({
+  id: "inject-system-cas",
+  instantiate: (di) => {
+    const requestSystemCAs = di.inject(requestSystemCAsInjectionToken);
+
+    return async () => {
+      const certs = await requestSystemCAs();
+
+      if (certs.length === 0) {
+        // Leave the global option alone
+        return;
+      }
+
+      const cas = (() => {
+        if (Array.isArray(globalAgent.options.ca)) {
+          return globalAgent.options.ca;
+        }
+
+        if (globalAgent.options.ca) {
+          return [globalAgent.options.ca];
+        }
+
+        return [];
+      })();
+
+      for (const cert of certs) {
+        if (!isCertActive(cert)) {
+          continue;
+        }
+
+        if (!cas.includes(cert)) {
+          cas.push(cert);
+        }
+      }
+
+      globalAgent.options.ca = cas;
+    };
+  },
+});
+
+export default injectSystemCAsInjectable;
+
diff --git a/src/common/certificate-authorities/request-system-cas-token.ts b/src/common/certificate-authorities/request-system-cas-token.ts
new file mode 100644
index 0000000000..c69b0bd8b0
--- /dev/null
+++ b/src/common/certificate-authorities/request-system-cas-token.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectionToken } from "@ogre-tools/injectable";
+
+export const requestSystemCAsInjectionToken = getInjectionToken<() => Promise<string[]>>({
+  id: "request-system-cas-token",
+});
diff --git a/src/common/certificate-authorities/request-system-cas.injectable.darwin.ts b/src/common/certificate-authorities/request-system-cas.injectable.darwin.ts
new file mode 100644
index 0000000000..c471c954e4
--- /dev/null
+++ b/src/common/certificate-authorities/request-system-cas.injectable.darwin.ts
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import execFileInjectable from "../fs/exec-file.injectable";
+import loggerInjectable from "../logger.injectable";
+import type { AsyncResult } from "../utils/async-result";
+import { requestSystemCAsInjectionToken } from "./request-system-cas-token";
+
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Cheatsheet#other_assertions
+const certSplitPattern = /(?=-----BEGIN\sCERTIFICATE-----)/g;
+
+const requestSystemCAsInjectable = getInjectable({
+  id: "request-system-cas",
+  instantiate: (di) => {
+    const execFile = di.inject(execFileInjectable);
+    const logger = di.inject(loggerInjectable);
+
+    const execSecurity = async (...args: string[]): Promise<AsyncResult<string[]>> => {
+      const result = await execFile("/usr/bin/security", args);
+
+      if (!result.callWasSuccessful) {
+        return {
+          callWasSuccessful: false,
+          error: result.error.stderr || result.error.message,
+        };
+      }
+
+      return {
+        callWasSuccessful: true,
+        response: result.response.split(certSplitPattern),
+      };
+    };
+
+    return async () => {
+      const [trustedResult, rootCAResult] = await Promise.all([
+        execSecurity("find-certificate", "-a", "-p"),
+        execSecurity("find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain"),
+      ]);
+
+      if (!trustedResult.callWasSuccessful) {
+        logger.warn(`[INJECT-CAS]: Error retreiving trusted CAs: ${trustedResult.error}`);
+      } else if (!rootCAResult.callWasSuccessful) {
+        logger.warn(`[INJECT-CAS]: Error retreiving root CAs: ${rootCAResult.error}`);
+      } else {
+        return [...new Set([...trustedResult.response, ...rootCAResult.response])];
+      }
+
+      return [];
+    };
+  },
+  causesSideEffects: true,
+  injectionToken: requestSystemCAsInjectionToken,
+});
+
+export default requestSystemCAsInjectable;
diff --git a/src/common/certificate-authorities/request-system-cas.injectable.linux.ts b/src/common/certificate-authorities/request-system-cas.injectable.linux.ts
new file mode 100644
index 0000000000..1d7bf10350
--- /dev/null
+++ b/src/common/certificate-authorities/request-system-cas.injectable.linux.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { requestSystemCAsInjectionToken } from "./request-system-cas-token";
+
+const requestSystemCAsInjectable = getInjectable({
+  id: "request-system-cas",
+  instantiate: () => async () => [],
+  injectionToken: requestSystemCAsInjectionToken,
+});
+
+export default requestSystemCAsInjectable;
diff --git a/src/common/certificate-authorities/request-system-cas.injectable.testing-env.ts b/src/common/certificate-authorities/request-system-cas.injectable.testing-env.ts
new file mode 100644
index 0000000000..1d7bf10350
--- /dev/null
+++ b/src/common/certificate-authorities/request-system-cas.injectable.testing-env.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { requestSystemCAsInjectionToken } from "./request-system-cas-token";
+
+const requestSystemCAsInjectable = getInjectable({
+  id: "request-system-cas",
+  instantiate: () => async () => [],
+  injectionToken: requestSystemCAsInjectionToken,
+});
+
+export default requestSystemCAsInjectable;
diff --git a/src/common/certificate-authorities/request-system-cas.injectable.win32.ts b/src/common/certificate-authorities/request-system-cas.injectable.win32.ts
new file mode 100644
index 0000000000..4940aa2a7b
--- /dev/null
+++ b/src/common/certificate-authorities/request-system-cas.injectable.win32.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import execFileInjectable from "../fs/exec-file.injectable";
+import loggerInjectable from "../logger.injectable";
+import { requestSystemCAsInjectionToken } from "./request-system-cas-token";
+
+const pemEncoding = (hexEncodedCert: String) => {
+  const certData = Buffer.from(hexEncodedCert, "hex").toString("base64");
+  const lines = ["-----BEGIN CERTIFICATE-----"];
+
+  for (let i = 0; i < certData.length; i += 64) {
+    lines.push(certData.substring(i, i + 64));
+  }
+
+  lines.push("-----END CERTIFICATE-----", "");
+
+  return lines.join("\r\n");
+};
+
+const requestSystemCAsInjectable = getInjectable({
+  id: "request-system-cas",
+  instantiate: (di) => {
+    const wincaRootsExePath: string = __non_webpack_require__.resolve("win-ca/lib/roots.exe");
+    const execFile = di.inject(execFileInjectable);
+    const logger = di.inject(loggerInjectable);
+
+    return async () => {
+      /**
+       * This needs to be done manually because for some reason calling the api from "win-ca"
+       * directly fails to load "child_process" correctly on renderer
+       */
+      const result = await execFile(wincaRootsExePath, {
+        maxBuffer: 128 * 1024 * 1024, // 128 MiB
+      });
+
+      if (!result.callWasSuccessful) {
+        logger.warn(`[INJECT-CAS]: Error retreiving CAs`, result.error);
+
+        return [];
+      }
+
+      return result
+        .response
+        .split("\r\n")
+        .filter(Boolean)
+        .map(pemEncoding);
+    };
+  },
+  causesSideEffects: true,
+  injectionToken: requestSystemCAsInjectionToken,
+});
+
+export default requestSystemCAsInjectable;
diff --git a/src/common/cluster-store/cluster-store.injectable.ts b/src/common/cluster-store/cluster-store.injectable.ts
index 5a601e1866..3e7cf86c53 100644
--- a/src/common/cluster-store/cluster-store.injectable.ts
+++ b/src/common/cluster-store/cluster-store.injectable.ts
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import { ClusterStore } from "./cluster-store";
 import { createClusterInjectionToken } from "../cluster/create-cluster-injection-token";
 import readClusterConfigSyncInjectable from "./read-cluster-config.injectable";
+import emitAppEventInjectable from "../app-event-bus/emit-event.injectable";
 
 const clusterStoreInjectable = getInjectable({
   id: "cluster-store",
@@ -16,6 +17,7 @@ const clusterStoreInjectable = getInjectable({
     return ClusterStore.createInstance({
       createCluster: di.inject(createClusterInjectionToken),
       readClusterConfigSync: di.inject(readClusterConfigSyncInjectable),
+      emitAppEvent: di.inject(emitAppEventInjectable),
     });
   },
 
diff --git a/src/common/cluster-store/cluster-store.ts b/src/common/cluster-store/cluster-store.ts
index 62b8cda973..7b46460013 100644
--- a/src/common/cluster-store/cluster-store.ts
+++ b/src/common/cluster-store/cluster-store.ts
@@ -10,7 +10,6 @@ import { BaseStore } from "../base-store";
 import { Cluster } from "../cluster/cluster";
 import migrations from "../../migrations/cluster-store";
 import logger from "../../main/logger";
-import { appEventBus } from "../app-event-bus/event-bus";
 import { ipcMainHandle } from "../ipc";
 import { disposer, toJS } from "../utils";
 import type { ClusterModel, ClusterId, ClusterState } from "../cluster-types";
@@ -18,6 +17,7 @@ import { requestInitialClusterStates } from "../../renderer/ipc";
 import { clusterStates } from "../ipc/cluster";
 import type { CreateCluster } from "../cluster/create-cluster-injection-token";
 import type { ReadClusterConfigSync } from "./read-cluster-config.injectable";
+import type { EmitAppEvent } from "../app-event-bus/emit-event.injectable";
 
 export interface ClusterStoreModel {
   clusters?: ClusterModel[];
@@ -26,6 +26,7 @@ export interface ClusterStoreModel {
 interface Dependencies {
   createCluster: CreateCluster;
   readClusterConfigSync: ReadClusterConfigSync;
+  emitAppEvent: EmitAppEvent;
 }
 
 export class ClusterStore extends BaseStore<ClusterStoreModel> {
@@ -34,7 +35,7 @@ export class ClusterStore extends BaseStore<ClusterStoreModel> {
 
   protected disposer = disposer();
 
-  constructor(private dependencies: Dependencies) {
+  constructor(private readonly dependencies: Dependencies) {
     super({
       configName: "lens-cluster-store",
       accessPropertiesByDotNotation: false, // To make dots safe in cluster context names
@@ -115,7 +116,7 @@ export class ClusterStore extends BaseStore<ClusterStoreModel> {
   }
 
   addCluster(clusterOrModel: ClusterModel | Cluster): Cluster {
-    appEventBus.emit({ name: "cluster", action: "add" });
+    this.dependencies.emitAppEvent({ name: "cluster", action: "add" });
 
     const cluster = clusterOrModel instanceof Cluster
       ? clusterOrModel
diff --git a/src/common/cluster-store/get-by-id.injectable.ts b/src/common/cluster-store/get-by-id.injectable.ts
new file mode 100644
index 0000000000..534bdb5e76
--- /dev/null
+++ b/src/common/cluster-store/get-by-id.injectable.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { ClusterId } from "../cluster-types";
+import type { Cluster } from "../cluster/cluster";
+import clusterStoreInjectable from "./cluster-store.injectable";
+
+export type GetClusterById = (id: ClusterId) => Cluster | undefined;
+
+const getClusterByIdInjectable = getInjectable({
+  id: "get-cluster-by-id",
+  instantiate: (di): GetClusterById => {
+    const store = di.inject(clusterStoreInjectable);
+
+    return (id) => store.getById(id);
+  },
+});
+
+export default getClusterByIdInjectable;
diff --git a/src/common/cluster-types.ts b/src/common/cluster-types.ts
index f0862e07b8..0cd447f0e2 100644
--- a/src/common/cluster-types.ts
+++ b/src/common/cluster-types.ts
@@ -3,6 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
+import Joi from "joi";
+
 /**
  * JSON serializable metadata type
  */
@@ -27,6 +29,37 @@ export type ClusterId = string;
  */
 export type UpdateClusterModel = Omit<ClusterModel, "id">;
 
+/**
+ * A type validator for `UpdateClusterModel` so that only expected types are present
+ */
+export const updateClusterModelChecker = Joi.object<UpdateClusterModel>({
+  kubeConfigPath: Joi.string()
+    .required()
+    .min(1),
+  contextName: Joi.string()
+    .required()
+    .min(1),
+  workspace: Joi.string()
+    .optional(),
+  workspaces: Joi.array()
+    .items(Joi.string()),
+  preferences: Joi.object(),
+  metadata: Joi.object(),
+  accessibleNamespaces: Joi.array()
+    .items(Joi.string()),
+  labels: Joi.object().pattern(Joi.string(), Joi.string()),
+});
+
+/**
+ * A type validator for just the `id` fields of `ClusterModel`. The rest is
+ * covered by `updateClusterModelChecker`
+ */
+export const clusterModelIdChecker = Joi.object<Pick<ClusterModel, "id">>({
+  id: Joi.string()
+    .required()
+    .min(1),
+});
+
 /**
  * The model for passing cluster data around, including to disk
  */
@@ -162,13 +195,6 @@ export enum ClusterMetricsResourceType {
  */
 export const initialNodeShellImage = "docker.io/alpine:3.13";
 
-/**
- * The arguments for requesting to refresh a cluster's metadata
- */
-export interface ClusterRefreshOptions {
-  refreshMetadata?: boolean;
-}
-
 /**
  * The data representing a cluster's state, for passing between main and renderer
  */
diff --git a/src/common/cluster/authorization-namespace-review.injectable.ts b/src/common/cluster/authorization-namespace-review.injectable.ts
new file mode 100644
index 0000000000..aa78453569
--- /dev/null
+++ b/src/common/cluster/authorization-namespace-review.injectable.ts
@@ -0,0 +1,87 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { KubeConfig } from "@kubernetes/client-node";
+import { AuthorizationV1Api } from "@kubernetes/client-node";
+import { getInjectable } from "@ogre-tools/injectable";
+import type { Logger } from "../logger";
+import loggerInjectable from "../logger.injectable";
+import type { KubeApiResource } from "../rbac";
+
+/**
+ * Requests the permissions for actions on the kube cluster
+ * @param namespace The namespace of the resources
+ * @param availableResources List of available resources in the cluster to resolve glob values fir api groups
+ * @returns list of allowed resources names
+ */
+export type RequestNamespaceResources = (namespace: string, availableResources: KubeApiResource[]) => Promise<string[]>; 
+
+/**
+ * @param proxyConfig This config's `currentContext` field must be set, and will be used as the target cluster
+ */
+export type AuthorizationNamespaceReview = (proxyConfig: KubeConfig) => RequestNamespaceResources; 
+
+interface Dependencies { 
+  logger: Logger;
+}
+
+const authorizationNamespaceReview = ({ logger }: Dependencies): AuthorizationNamespaceReview => {
+  return (proxyConfig) => {
+
+    const api = proxyConfig.makeApiClient(AuthorizationV1Api);
+
+    return async (namespace, availableResources) => {
+      try {
+        const { body } = await api.createSelfSubjectRulesReview({
+          apiVersion: "authorization.k8s.io/v1",
+          kind: "SelfSubjectRulesReview",
+          spec: { namespace },
+        });
+
+        const resources = new Set<string>();
+
+        body.status?.resourceRules.forEach(resourceRule => {
+          if (!resourceRule.verbs.some(verb => ["*", "list"].includes(verb)) || !resourceRule.resources) {
+            return;
+          }
+
+          const apiGroups = resourceRule.apiGroups;
+
+          if (resourceRule.resources.length === 1 && resourceRule.resources[0] === "*" && apiGroups) {
+            if (apiGroups[0] === "*") {
+              availableResources.forEach(resource => resources.add(resource.apiName));
+            } else {
+              availableResources.forEach((apiResource)=> {
+                if (apiGroups.includes(apiResource.group || "")) {
+                  resources.add(apiResource.apiName);
+                }
+              });
+            }
+          } else {
+            resourceRule.resources.forEach(resource => resources.add(resource));
+          }
+          
+        });
+
+        return [...resources];
+      } catch (error) {
+        logger.error(`[AUTHORIZATION-NAMESPACE-REVIEW]: failed to create subject rules review: ${error}`, { namespace });
+
+        return [];
+      }
+    };
+  };
+};
+
+const authorizationNamespaceReviewInjectable = getInjectable({
+  id: "authorization-namespace-review",
+  instantiate: (di) => {
+    const logger = di.inject(loggerInjectable);
+
+    return authorizationNamespaceReview({ logger });
+  },
+});
+
+export default authorizationNamespaceReviewInjectable;
diff --git a/src/common/cluster/authorization-review.injectable.ts b/src/common/cluster/authorization-review.injectable.ts
index c622893b63..4c9b83330d 100644
--- a/src/common/cluster/authorization-review.injectable.ts
+++ b/src/common/cluster/authorization-review.injectable.ts
@@ -5,42 +5,55 @@
 
 import type { KubeConfig, V1ResourceAttributes } from "@kubernetes/client-node";
 import { AuthorizationV1Api } from "@kubernetes/client-node";
-import logger from "../logger";
 import { getInjectable } from "@ogre-tools/injectable";
+import type { Logger } from "../logger";
+import loggerInjectable from "../logger.injectable";
 
+/**
+ * Requests the permissions for actions on the kube cluster
+ * @param resourceAttributes The descriptor of the action that is desired to be known if it is allowed
+ * @returns `true` if the actions described are allowed
+ */
 export type CanI = (resourceAttributes: V1ResourceAttributes) => Promise<boolean>;
 
 /**
  * @param proxyConfig This config's `currentContext` field must be set, and will be used as the target cluster
-   */
-export function authorizationReview(proxyConfig: KubeConfig): CanI {
-  const api = proxyConfig.makeApiClient(AuthorizationV1Api);
+ */
+export type AuthorizationReview = (proxyConfig: KubeConfig) => CanI; 
 
-  /**
-   * Requests the permissions for actions on the kube cluster
-   * @param resourceAttributes The descriptor of the action that is desired to be known if it is allowed
-   * @returns `true` if the actions described are allowed
-   */
-  return async (resourceAttributes: V1ResourceAttributes): Promise<boolean> => {
-    try {
-      const { body } = await api.createSelfSubjectAccessReview({
-        apiVersion: "authorization.k8s.io/v1",
-        kind: "SelfSubjectAccessReview",
-        spec: { resourceAttributes },
-      });
-
-      return body.status?.allowed ?? false;
-    } catch (error) {
-      logger.error(`[AUTHORIZATION-REVIEW]: failed to create access review: ${error}`, { resourceAttributes });
-
-      return false;
-    }
-  };
+interface Dependencies { 
+  logger: Logger;
 }
 
+const authorizationReview = ({ logger }: Dependencies): AuthorizationReview => {
+  return (proxyConfig) => {
+    const api = proxyConfig.makeApiClient(AuthorizationV1Api);
+
+    return async (resourceAttributes: V1ResourceAttributes): Promise<boolean> => {
+      try {
+        const { body } = await api.createSelfSubjectAccessReview({
+          apiVersion: "authorization.k8s.io/v1",
+          kind: "SelfSubjectAccessReview",
+          spec: { resourceAttributes },
+        });
+
+        return body.status?.allowed ?? false;
+      } catch (error) {
+        logger.error(`[AUTHORIZATION-REVIEW]: failed to create access review: ${error}`, { resourceAttributes });
+
+        return false;
+      }
+    };
+  };
+};
+
 const authorizationReviewInjectable = getInjectable({
   id: "authorization-review",
-  instantiate: () => authorizationReview,
+  instantiate: (di) => {
+    const logger = di.inject(loggerInjectable);
+
+    return authorizationReview({ logger });
+  },
 });
 
 export default authorizationReviewInjectable;
diff --git a/src/common/cluster/cluster.ts b/src/common/cluster/cluster.ts
index f1a943732c..7f27025190 100644
--- a/src/common/cluster/cluster.ts
+++ b/src/common/cluster/cluster.ts
@@ -9,14 +9,13 @@ import type { KubeConfig } from "@kubernetes/client-node";
 import { HttpError } from "@kubernetes/client-node";
 import type { Kubectl } from "../../main/kubectl/kubectl";
 import type { KubeconfigManager } from "../../main/kubeconfig-manager/kubeconfig-manager";
-import { loadConfigFromFile } from "../kube-helpers";
 import type { KubeApiResource, KubeResource } from "../rbac";
 import { apiResourceRecord, apiResources } from "../rbac";
 import type { VersionDetector } from "../../main/cluster-detectors/version-detector";
 import type { DetectorRegistry } from "../../main/cluster-detectors/detector-registry";
 import plimit from "p-limit";
-import type { ClusterState, ClusterRefreshOptions, ClusterMetricsResourceType, ClusterId, ClusterMetadata, ClusterModel, ClusterPreferences, ClusterPrometheusPreferences, UpdateClusterModel, KubeAuthUpdate, ClusterConfigData } from "../cluster-types";
-import { ClusterMetadataKey, initialNodeShellImage, ClusterStatus } from "../cluster-types";
+import type { ClusterState, ClusterMetricsResourceType, ClusterId, ClusterMetadata, ClusterModel, ClusterPreferences, ClusterPrometheusPreferences, UpdateClusterModel, KubeAuthUpdate, ClusterConfigData } from "../cluster-types";
+import { ClusterMetadataKey, initialNodeShellImage, ClusterStatus, clusterModelIdChecker, updateClusterModelChecker } from "../cluster-types";
 import { disposer, isDefined, isRequestError, toJS } from "../utils";
 import type { Response } from "request";
 import { clusterListNamespaceForbiddenChannel } from "../ipc/cluster";
@@ -25,6 +24,9 @@ import type { ListNamespaces } from "./list-namespaces.injectable";
 import assert from "assert";
 import type { Logger } from "../logger";
 import type { BroadcastMessage } from "../ipc/broadcast-message.injectable";
+import type { LoadConfigfromFile } from "../kube-helpers/load-config-from-file.injectable";
+import type { RequestNamespaceResources } from "./authorization-namespace-review.injectable";
+import type { RequestListApiResources } from "./list-api-resources.injectable";
 
 export interface ClusterDependencies {
   readonly directoryForKubeConfigs: string;
@@ -34,9 +36,12 @@ export interface ClusterDependencies {
   createContextHandler: (cluster: Cluster) => ClusterContextHandler;
   createKubectl: (clusterVersion: string) => Kubectl;
   createAuthorizationReview: (config: KubeConfig) => CanI;
+  createAuthorizationNamespaceReview: (config: KubeConfig) => RequestNamespaceResources;
+  createListApiResources: (cluster: Cluster) => RequestListApiResources;
   createListNamespaces: (config: KubeConfig) => ListNamespaces;
   createVersionDetector: (cluster: Cluster) => VersionDetector;
   broadcastMessage: BroadcastMessage;
+  loadConfigfromFile: LoadConfigfromFile;
 }
 
 /**
@@ -237,9 +242,16 @@ export class Cluster implements ClusterModel, ClusterState {
     return this.preferences.defaultNamespace;
   }
 
-  constructor(private readonly dependencies: ClusterDependencies, model: ClusterModel, configData: ClusterConfigData) {
+  constructor(private readonly dependencies: ClusterDependencies, { id, ...model }: ClusterModel, configData: ClusterConfigData) {
     makeObservable(this);
-    this.id = model.id;
+
+    const { error } = clusterModelIdChecker.validate({ id });
+
+    if (error) {
+      throw error;
+    }
+
+    this.id = id;
     this.updateModel(model);
     this.apiUrl = configData.clusterServerUrl;
 
@@ -261,6 +273,12 @@ export class Cluster implements ClusterModel, ClusterState {
   @action updateModel(model: UpdateClusterModel) {
     // Note: do not assign ID as that should never be updated
 
+    const { error } = updateClusterModelChecker.validate(model, { allowUnknown: true });
+
+    if (error) {
+      throw error;
+    }
+
     this.kubeConfigPath = model.kubeConfigPath;
     this.contextName = model.contextName;
 
@@ -295,7 +313,7 @@ export class Cluster implements ClusterModel, ClusterState {
   protected bindEvents() {
     this.dependencies.logger.info(`[CLUSTER]: bind events`, this.getMeta());
     const refreshTimer = setInterval(() => !this.disconnected && this.refresh(), 30000); // every 30s
-    const refreshMetadataTimer = setInterval(() => !this.disconnected && this.refreshMetadata(), 900000); // every 15 minutes
+    const refreshMetadataTimer = setInterval(() => this.available && this.refreshAccessibilityAndMetadata(), 900000); // every 15 minutes
 
     this.eventsDisposer.push(
       reaction(() => this.getState(), state => this.pushState(state)),
@@ -425,69 +443,71 @@ export class Cluster implements ClusterModel, ClusterState {
 
   /**
    * @internal
-   * @param opts refresh options
    */
   @action
-  async refresh(opts: ClusterRefreshOptions = {}) {
+  async refresh() {
     this.dependencies.logger.info(`[CLUSTER]: refresh`, this.getMeta());
     await this.refreshConnectionStatus();
-
-    if (this.accessible) {
-      await this.refreshAccessibility();
-
-      if (opts.refreshMetadata) {
-        this.refreshMetadata();
-      }
-    }
     this.pushState();
   }
 
   /**
    * @internal
    */
-  @action
-  async refreshMetadata() {
-    this.dependencies.logger.info(`[CLUSTER]: refreshMetadata`, this.getMeta());
-    const metadata = await this.dependencies.detectorRegistry.detectForCluster(this);
-    const existingMetadata = this.metadata;
-
-    this.metadata = Object.assign(existingMetadata, metadata);
+   @action
+  async refreshAccessibilityAndMetadata() {
+    await this.refreshAccessibility();
+    await this.refreshMetadata();
   }
 
-  /**
+   /**
    * @internal
    */
-  private async refreshAccessibility(): Promise<void> {
-    const proxyConfig = await this.getProxyKubeconfig();
-    const canI = this.dependencies.createAuthorizationReview(proxyConfig);
+   async refreshMetadata() {
+     this.dependencies.logger.info(`[CLUSTER]: refreshMetadata`, this.getMeta());
+     const metadata = await this.dependencies.detectorRegistry.detectForCluster(this);
+     const existingMetadata = this.metadata;
 
-    this.isAdmin = await canI({
-      namespace: "kube-system",
-      resource: "*",
-      verb: "create",
-    });
-    this.isGlobalWatchEnabled = await canI({
-      verb: "watch",
-      resource: "*",
-    });
-    this.allowedNamespaces = await this.getAllowedNamespaces(proxyConfig);
-    this.allowedResources = await this.getAllowedResources(canI);
-    this.ready = true;
-  }
+     this.metadata = Object.assign(existingMetadata, metadata);
+   }
+
+   /**
+   * @internal
+   */
+   private async refreshAccessibility(): Promise<void> {
+     this.dependencies.logger.info(`[CLUSTER]: refreshAccessibility`, this.getMeta());
+     const proxyConfig = await this.getProxyKubeconfig();
+     const canI = this.dependencies.createAuthorizationReview(proxyConfig);
+     const requestNamespaceResources = this.dependencies.createAuthorizationNamespaceReview(proxyConfig);
+     const listApiResources = this.dependencies.createListApiResources(this);
+
+     this.isAdmin = await canI({
+       namespace: "kube-system",
+       resource: "*",
+       verb: "create",
+     });
+     this.isGlobalWatchEnabled = await canI({
+       verb: "watch",
+       resource: "*",
+     });
+     this.allowedNamespaces = await this.getAllowedNamespaces(proxyConfig);
+     this.allowedResources = await this.getAllowedResources(listApiResources, requestNamespaceResources);
+     this.ready = true;
+   }
 
   /**
    * @internal
    */
   @action
-  async refreshConnectionStatus() {
-    const connectionStatus = await this.getConnectionStatus();
+   async refreshConnectionStatus() {
+     const connectionStatus = await this.getConnectionStatus();
 
-    this.online = connectionStatus > ClusterStatus.Offline;
-    this.accessible = connectionStatus == ClusterStatus.AccessGranted;
-  }
+     this.online = connectionStatus > ClusterStatus.Offline;
+     this.accessible = connectionStatus == ClusterStatus.AccessGranted;
+   }
 
   async getKubeconfig(): Promise<KubeConfig> {
-    const { config } = await loadConfigFromFile(this.kubeConfigPath);
+    const { config } = await this.dependencies.loadConfigfromFile(this.kubeConfigPath);
 
     return config;
   }
@@ -497,7 +517,7 @@ export class Cluster implements ClusterModel, ClusterState {
    */
   async getProxyKubeconfig(): Promise<KubeConfig> {
     const proxyKCPath = await this.getProxyKubeconfigPath();
-    const { config } = await loadConfigFromFile(proxyKCPath);
+    const { config } = await this.dependencies.loadConfigfromFile(proxyKCPath);
 
     return config;
   }
@@ -653,32 +673,48 @@ export class Cluster implements ClusterModel, ClusterState {
     }
   }
 
-  protected async getAllowedResources(canI: CanI) {
+  protected async getAllowedResources(listApiResources:RequestListApiResources, requestNamespaceResources: RequestNamespaceResources) {
     try {
       if (!this.allowedNamespaces.length) {
         return [];
       }
-      const resources = apiResources.filter((resource) => this.resourceAccessStatuses.get(resource) === undefined);
-      const apiLimit = plimit(5); // 5 concurrent api requests
-      const requests = [];
 
-      for (const apiResource of resources) {
-        requests.push(apiLimit(async () => {
-          for (const namespace of this.allowedNamespaces.slice(0, 10)) {
-            if (!this.resourceAccessStatuses.get(apiResource)) {
-              const result = await canI({
-                resource: apiResource.apiName,
-                group: apiResource.group,
-                verb: "list",
-                namespace,
-              });
+      const unknownResources = new Map<string, KubeApiResource>(apiResources.map(resource => ([resource.apiName, resource])));
 
-              this.resourceAccessStatuses.set(apiResource, result);
+      const availableResources =  await listApiResources();
+      const availableResourcesNames = new Set(availableResources.map(apiResource => apiResource.apiName));
+
+      [...unknownResources.values()].map(unknownResource => {
+        if (!availableResourcesNames.has(unknownResource.apiName)) {
+          this.resourceAccessStatuses.set(unknownResource, false);
+          unknownResources.delete(unknownResource.apiName);
+        }
+      });
+
+      if (unknownResources.size > 0) {
+        const apiLimit = plimit(5); // 5 concurrent api requests
+
+        await Promise.all(this.allowedNamespaces.map(namespace => apiLimit(async () => {
+          if (unknownResources.size === 0) {
+            return;
+          }
+
+          const namespaceResources = await requestNamespaceResources(namespace, availableResources);
+
+          for (const resourceName of namespaceResources) {
+            const unknownResource = unknownResources.get(resourceName);
+
+            if (unknownResource) {
+              this.resourceAccessStatuses.set(unknownResource, true);
+              unknownResources.delete(resourceName);
             }
           }
-        }));
+        })));
+
+        for (const forbiddenResource of unknownResources.values()) {
+          this.resourceAccessStatuses.set(forbiddenResource, false);
+        }
       }
-      await Promise.all(requests);
 
       return apiResources
         .filter((resource) => this.resourceAccessStatuses.get(resource))
diff --git a/src/common/cluster/list-api-resources.injectable.ts b/src/common/cluster/list-api-resources.injectable.ts
new file mode 100644
index 0000000000..ed9d5c9c39
--- /dev/null
+++ b/src/common/cluster/list-api-resources.injectable.ts
@@ -0,0 +1,91 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type {
+  V1APIGroupList,
+  V1APIResourceList,
+  V1APIVersions,
+} from "@kubernetes/client-node";
+import { getInjectable } from "@ogre-tools/injectable";
+import type { K8sRequest } from "../../main/k8s-request.injectable";
+import k8SRequestInjectable from "../../main/k8s-request.injectable";
+import type { Logger } from "../logger";
+import loggerInjectable from "../logger.injectable";
+import type { KubeApiResource, KubeResource } from "../rbac";
+import type { Cluster } from "./cluster";
+import plimit from "p-limit";
+
+export type RequestListApiResources = () => Promise<KubeApiResource[]>;
+
+/**
+ * @param proxyConfig This config's `currentContext` field must be set, and will be used as the target cluster
+ */
+export type ListApiResources = (cluster: Cluster) => RequestListApiResources;
+
+interface Dependencies {
+  logger: Logger;
+  k8sRequest: K8sRequest;
+}
+
+const listApiResources = ({ k8sRequest, logger }: Dependencies): ListApiResources => {
+  return (cluster) => {
+    const clusterRequest = (path: string) => k8sRequest(cluster, path);
+    const apiLimit = plimit(5);
+
+    return async () => {
+      const resources: KubeApiResource[] = [];
+
+      try {
+        const resourceListGroups:{ group:string;path:string }[] = [];
+
+        await Promise.all(
+          [
+            clusterRequest("/api").then((response:V1APIVersions)=>response.versions.forEach(version => resourceListGroups.push({ group:version, path:`/api/${version}` }))),
+            clusterRequest("/apis").then((response:V1APIGroupList) => response.groups.forEach(group => {
+              const preferredVersion = group.preferredVersion?.groupVersion;
+
+              if (preferredVersion) {
+                resourceListGroups.push({ group:group.name, path:`/apis/${preferredVersion}` });
+              }
+            })),
+          ],
+        );
+
+        await Promise.all(
+          resourceListGroups.map(({ group, path }) => apiLimit(async () => {
+            const apiResources:V1APIResourceList = await clusterRequest(path);
+
+            if (apiResources.resources) {
+              resources.push(
+                ...apiResources.resources.filter(resource => resource.verbs.includes("list")).map((resource) => ({
+                  apiName: resource.name as KubeResource,
+                  kind: resource.kind,
+                  group,
+                })),
+              );
+            }
+          }),
+          ),
+        );
+      } catch (error) {
+        logger.error(`[LIST-API-RESOURCES]: failed to list api resources: ${error}`);
+      }
+
+      return resources;
+    };
+  };
+};
+
+const listApiResourcesInjectable = getInjectable({
+  id: "list-api-resources",
+  instantiate: (di) => {
+    const k8sRequest = di.inject(k8SRequestInjectable);
+    const logger = di.inject(loggerInjectable);
+
+    return listApiResources({ k8sRequest, logger });
+  },
+});
+
+export default listApiResourcesInjectable;
diff --git a/src/common/cluster/visibility-channel.ts b/src/common/cluster/visibility-channel.ts
new file mode 100644
index 0000000000..8a1a297ff2
--- /dev/null
+++ b/src/common/cluster/visibility-channel.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { ClusterId } from "../cluster-types";
+import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token";
+
+export const clusterVisibilityChannel: MessageChannel<ClusterId | null> = {
+  id: "cluster-visibility",
+};
diff --git a/src/common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable.ts b/src/common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable.ts
index 4bb5cb2495..11a8f3f7de 100644
--- a/src/common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable.ts
+++ b/src/common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable.ts
@@ -4,16 +4,16 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
-import getAbsolutePathInjectable from "../path/get-absolute-path.injectable";
+import joinPathsInjectable from "../path/join-paths.injectable";
 
 const directoryForLensLocalStorageInjectable = getInjectable({
   id: "directory-for-lens-local-storage",
 
   instantiate: (di) => {
-    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
     const directoryForUserData = di.inject(directoryForUserDataInjectable);
 
-    return getAbsolutePath(
+    return joinPaths(
       directoryForUserData,
       "lens-local-storage",
     );
diff --git a/src/common/error-reporting/initialize-sentry-reporting.global-override-for-injectable.ts b/src/common/error-reporting/initialize-sentry-reporting.global-override-for-injectable.ts
new file mode 100644
index 0000000000..1aa2934ef9
--- /dev/null
+++ b/src/common/error-reporting/initialize-sentry-reporting.global-override-for-injectable.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import initializeSentryReportingWithInjectable from "./initialize-sentry-reporting.injectable";
+
+export default getGlobalOverride(initializeSentryReportingWithInjectable, () => () => {});
diff --git a/src/common/error-reporting/initialize-sentry-reporting.injectable.ts b/src/common/error-reporting/initialize-sentry-reporting.injectable.ts
new file mode 100644
index 0000000000..778f959739
--- /dev/null
+++ b/src/common/error-reporting/initialize-sentry-reporting.injectable.ts
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { ElectronMainOptions } from "@sentry/electron/main";
+import type { BrowserOptions } from "@sentry/electron/renderer";
+import isProductionInjectable from "../vars/is-production.injectable";
+import sentryDataSourceNameInjectable from "../vars/sentry-dsn-url.injectable";
+import { Dedupe, Offline } from "@sentry/integrations";
+import { inspect } from "util";
+import userStoreInjectable from "../user-store/user-store.injectable";
+
+export type InitializeSentryReportingWith = (initSentry: (opts: BrowserOptions | ElectronMainOptions) => void) => void;
+
+const mapProcessName = (type: "browser" | "renderer" | "worker") => type === "browser" ? "main" : type;
+
+const initializeSentryReportingWithInjectable = getInjectable({
+  id: "initialize-sentry-reporting-with",
+  instantiate: (di): InitializeSentryReportingWith => {
+    const sentryDataSourceName = di.inject(sentryDataSourceNameInjectable);
+    const isProduction = di.inject(isProductionInjectable);
+    const userStore = di.inject(userStoreInjectable);
+
+    if (!sentryDataSourceName) {
+      return () => {};
+    }
+
+    return (initSentry) => initSentry({
+      beforeSend: (event) => {
+        if (userStore.allowErrorReporting) {
+          return event;
+        }
+
+        /**
+         * Directly write to stdout so that no other integrations capture this and create an infinite loop
+         */
+        process.stdout.write(`🔒  [SENTRY-BEFORE-SEND-HOOK]: Sentry event is caught but not sent to server.`);
+        process.stdout.write("🔒  [SENTRY-BEFORE-SEND-HOOK]: === START OF SENTRY EVENT ===");
+        process.stdout.write(inspect(event, false, null, true));
+        process.stdout.write("🔒  [SENTRY-BEFORE-SEND-HOOK]: ===  END OF SENTRY EVENT  ===");
+
+        // if return null, the event won't be sent
+        // ref https://github.com/getsentry/sentry-javascript/issues/2039
+        return null;
+      },
+      dsn: sentryDataSourceName,
+      integrations: [
+        new Dedupe(),
+        new Offline(),
+      ],
+      initialScope: {
+        tags: {
+          "process": mapProcessName(process.type),
+        },
+      },
+      environment: isProduction ? "production" : "development",
+    });
+  },
+  causesSideEffects: true,
+});
+
+export default initializeSentryReportingWithInjectable;
diff --git a/src/common/event-emitter.ts b/src/common/event-emitter.ts
index 4d7f5ca53c..03f8e2754b 100644
--- a/src/common/event-emitter.ts
+++ b/src/common/event-emitter.ts
@@ -29,7 +29,7 @@ export class EventEmitter<D extends [...any[]]> {
     this.listeners.length = 0;
   }
 
-  emit = (...data: D) => {
+  emit(...data: D) {
     for (const [callback, { once }] of this.listeners) {
       if (once) {
         this.removeListener(callback);
@@ -39,5 +39,5 @@ export class EventEmitter<D extends [...any[]]> {
         break;
       }
     }
-  };
+  }
 }
diff --git a/src/common/fetch/download-binary.injectable.ts b/src/common/fetch/download-binary.injectable.ts
new file mode 100644
index 0000000000..27ef43d59b
--- /dev/null
+++ b/src/common/fetch/download-binary.injectable.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { RequestInit, Response } from "node-fetch";
+import type { AsyncResult } from "../utils/async-result";
+import fetchInjectable from "./fetch.injectable";
+
+export interface DownloadBinaryOptions {
+  signal?: AbortSignal | null | undefined;
+}
+
+export type DownloadBinary = (url: string, opts?: DownloadBinaryOptions) => Promise<AsyncResult<Buffer, string>>;
+
+const downloadBinaryInjectable = getInjectable({
+  id: "download-binary",
+  instantiate: (di): DownloadBinary => {
+    const fetch = di.inject(fetchInjectable);
+
+    return async (url, opts) => {
+      let result: Response;
+
+      try {
+        // TODO: upgrade node-fetch once we switch to ESM
+        result = await fetch(url, opts as RequestInit);
+      } catch (error) {
+        return {
+          callWasSuccessful: false,
+          error: String(error),
+        };
+      }
+
+      if (result.status < 200 || 300 <= result.status) {
+        return {
+          callWasSuccessful: false,
+          error: result.statusText,
+        };
+      }
+
+      try {
+        return {
+          callWasSuccessful: true,
+          response: await result.buffer(),
+        };
+      } catch (error) {
+        return {
+          callWasSuccessful: false,
+          error: String(error),
+        };
+      }
+    };
+  },
+});
+
+export default downloadBinaryInjectable;
diff --git a/src/common/fetch/download-json.injectable.ts b/src/common/fetch/download-json.injectable.ts
new file mode 100644
index 0000000000..78a7d030d7
--- /dev/null
+++ b/src/common/fetch/download-json.injectable.ts
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { RequestInit, Response } from "node-fetch";
+import type { AsyncResult } from "../utils/async-result";
+import fetchInjectable from "./fetch.injectable";
+
+export interface DownloadJsonOptions {
+  signal?: AbortSignal | null | undefined;
+}
+
+export type DownloadJson = (url: string, opts?: DownloadJsonOptions) => Promise<AsyncResult<unknown, string>>;
+
+const downloadJsonInjectable = getInjectable({
+  id: "download-json",
+  instantiate: (di): DownloadJson => {
+    const fetch = di.inject(fetchInjectable);
+
+    return async (url, opts) => {
+      let result: Response;
+
+      try {
+        result = await fetch(url, opts as RequestInit);
+      } catch (error) {
+        return {
+          callWasSuccessful: false,
+          error: String(error),
+        };
+      }
+
+      if (result.status < 200 || 300 <= result.status) {
+        return {
+          callWasSuccessful: false,
+          error: result.statusText,
+        };
+      }
+
+      try {
+        return {
+          callWasSuccessful: true,
+          response: await result.json(),
+        };
+      } catch (error) {
+        return {
+          callWasSuccessful: false,
+          error: String(error),
+        };
+      }
+    };
+  },
+});
+
+export default downloadJsonInjectable;
diff --git a/src/common/fetch/fetch.global-override-for-injectable.ts b/src/common/fetch/fetch.global-override-for-injectable.ts
new file mode 100644
index 0000000000..1a5f80735c
--- /dev/null
+++ b/src/common/fetch/fetch.global-override-for-injectable.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverrideForFunction } from "../test-utils/get-global-override-for-function";
+import fetchInjectable from "./fetch.injectable";
+
+export default getGlobalOverrideForFunction(fetchInjectable);
diff --git a/src/common/fetch/fetch.injectable.ts b/src/common/fetch/fetch.injectable.ts
new file mode 100644
index 0000000000..e320c0128a
--- /dev/null
+++ b/src/common/fetch/fetch.injectable.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type * as FetchModule from "node-fetch";
+
+const { NodeFetch: { default: fetch }} = require("../../../build/webpack/node-fetch.bundle") as { NodeFetch: typeof FetchModule };
+
+type Response = FetchModule.Response;
+type RequestInit = FetchModule.RequestInit;
+
+export type Fetch = (url: string, init?: RequestInit) => Promise<Response>;
+
+const fetchInjectable = getInjectable({
+  id: "fetch",
+  instantiate: (): Fetch => fetch,
+  causesSideEffects: true,
+});
+
+export default fetchInjectable;
diff --git a/src/common/fetch/timeout-controller.ts b/src/common/fetch/timeout-controller.ts
new file mode 100644
index 0000000000..702becdc9d
--- /dev/null
+++ b/src/common/fetch/timeout-controller.ts
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+/**
+ * Creates an AbortController with an associated timeout
+ * @param timeout The number of milliseconds before this controller will auto abort
+ */
+export function withTimeout(timeout: number): AbortController {
+  const controller = new AbortController();
+  const id = setTimeout(() => controller.abort(), timeout);
+
+  controller.signal.addEventListener("abort", () => clearTimeout(id));
+
+  return controller;
+}
diff --git a/src/common/front-end-routing/app-navigation-channel.injectable.ts b/src/common/front-end-routing/app-navigation-channel.injectable.ts
deleted file mode 100644
index 869fbfdecd..0000000000
--- a/src/common/front-end-routing/app-navigation-channel.injectable.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { IpcRendererNavigationEvents } from "../../renderer/navigation/events";
-import type { MessageChannel } from "../utils/channel/message-channel-injection-token";
-import { messageChannelInjectionToken } from "../utils/channel/message-channel-injection-token";
-
-export type AppNavigationChannel = MessageChannel<string>;
-
-const appNavigationChannelInjectable = getInjectable({
-  id: "app-navigation-channel",
-
-  instantiate: (): AppNavigationChannel => ({
-    id: IpcRendererNavigationEvents.NAVIGATE_IN_APP,
-  }),
-
-  injectionToken: messageChannelInjectionToken,
-});
-
-export default appNavigationChannelInjectable;
diff --git a/src/common/front-end-routing/app-navigation-channel.ts b/src/common/front-end-routing/app-navigation-channel.ts
new file mode 100644
index 0000000000..e0b881eff9
--- /dev/null
+++ b/src/common/front-end-routing/app-navigation-channel.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { IpcRendererNavigationEvents } from "../../renderer/navigation/events";
+import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token";
+
+export type AppNavigationChannel = MessageChannel<string>;
+
+export const appNavigationChannel: AppNavigationChannel = {
+  id: IpcRendererNavigationEvents.NAVIGATE_IN_APP,
+};
diff --git a/src/common/front-end-routing/cluster-frame-navigation-channel.injectable.ts b/src/common/front-end-routing/cluster-frame-navigation-channel.injectable.ts
deleted file mode 100644
index 596bd6d351..0000000000
--- a/src/common/front-end-routing/cluster-frame-navigation-channel.injectable.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { IpcRendererNavigationEvents } from "../../renderer/navigation/events";
-import type { MessageChannel } from "../utils/channel/message-channel-injection-token";
-import { messageChannelInjectionToken } from "../utils/channel/message-channel-injection-token";
-
-export type ClusterFrameNavigationChannel = MessageChannel<string>;
-
-const clusterFrameNavigationChannelInjectable = getInjectable({
-  id: "cluster-frame-navigation-channel",
-
-  instantiate: (): ClusterFrameNavigationChannel => ({
-    id: IpcRendererNavigationEvents.NAVIGATE_IN_CLUSTER,
-  }),
-
-  injectionToken: messageChannelInjectionToken,
-});
-
-export default clusterFrameNavigationChannelInjectable;
diff --git a/src/common/front-end-routing/cluster-frame-navigation-channel.ts b/src/common/front-end-routing/cluster-frame-navigation-channel.ts
new file mode 100644
index 0000000000..9d9a1904af
--- /dev/null
+++ b/src/common/front-end-routing/cluster-frame-navigation-channel.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { IpcRendererNavigationEvents } from "../../renderer/navigation/events";
+import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token";
+
+export type ClusterFrameNavigationChannel = MessageChannel<string>;
+
+export const clusterFrameNavigationChannel: ClusterFrameNavigationChannel = {
+  id: IpcRendererNavigationEvents.NAVIGATE_IN_CLUSTER,
+};
diff --git a/src/common/front-end-routing/routes/cluster/config/leases/leases-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/leases/leases-route.injectable.ts
new file mode 100644
index 0000000000..65ee0e3ffa
--- /dev/null
+++ b/src/common/front-end-routing/routes/cluster/config/leases/leases-route.injectable.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
+
+const leasesRouteInjectable = getInjectable({
+  id: "leases",
+
+  instantiate: (di) => {
+    const isAllowedResource = di.inject(isAllowedResourceInjectable, "leases");
+
+    return {
+      path: "/leases",
+      clusterFrame: true,
+      isEnabled: isAllowedResource,
+    };
+  },
+
+  injectionToken: frontEndRouteInjectionToken,
+});
+
+export default leasesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/config/leases/navigate-to-leases.injectable.ts b/src/common/front-end-routing/routes/cluster/config/leases/navigate-to-leases.injectable.ts
new file mode 100644
index 0000000000..5bf7d74ff1
--- /dev/null
+++ b/src/common/front-end-routing/routes/cluster/config/leases/navigate-to-leases.injectable.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import leasesRouteInjectable from "./leases-route.injectable";
+import { navigateToRouteInjectionToken } from "../../../../navigate-to-route-injection-token";
+
+const navigateToLeasesInjectable = getInjectable({
+  id: "navigate-to-leases",
+
+  instantiate: (di) => {
+    const navigateToRoute = di.inject(navigateToRouteInjectionToken);
+    const route = di.inject(leasesRouteInjectable);
+
+    return () => navigateToRoute(route);
+  },
+});
+
+export default navigateToLeasesInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/app/navigate-to-app-preferences.injectable.ts b/src/common/front-end-routing/routes/cluster/config/runtime-classes/navigate-to-runtime-classes.injectable.ts
similarity index 50%
rename from src/common/front-end-routing/routes/preferences/app/navigate-to-app-preferences.injectable.ts
rename to src/common/front-end-routing/routes/cluster/config/runtime-classes/navigate-to-runtime-classes.injectable.ts
index 4f83d47dec..4d6ca1757d 100644
--- a/src/common/front-end-routing/routes/preferences/app/navigate-to-app-preferences.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/config/runtime-classes/navigate-to-runtime-classes.injectable.ts
@@ -3,18 +3,18 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import appPreferencesRouteInjectable from "./app-preferences-route.injectable";
-import { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token";
+import runtimeClassesRouteInjectable from "./runtime-classes-route.injectable";
+import { navigateToRouteInjectionToken } from "../../../../navigate-to-route-injection-token";
 
-const navigateToAppPreferencesInjectable = getInjectable({
-  id: "navigate-to-app-preferences",
+const navigateToRuntimeClassesInjectable = getInjectable({
+  id: "navigate-to-runtime-classes",
 
   instantiate: (di) => {
     const navigateToRoute = di.inject(navigateToRouteInjectionToken);
-    const route = di.inject(appPreferencesRouteInjectable);
+    const route = di.inject(runtimeClassesRouteInjectable);
 
     return () => navigateToRoute(route);
   },
 });
 
-export default navigateToAppPreferencesInjectable;
+export default navigateToRuntimeClassesInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/config/runtime-classes/runtime-classes-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/runtime-classes/runtime-classes-route.injectable.ts
new file mode 100644
index 0000000000..72934f9158
--- /dev/null
+++ b/src/common/front-end-routing/routes/cluster/config/runtime-classes/runtime-classes-route.injectable.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
+
+const runtimeClassesRouteInjectable = getInjectable({
+  id: "runtime-classes-route",
+
+  instantiate: (di) => {
+    const isAllowedResource = di.inject(isAllowedResourceInjectable, "runtimeclasses");
+
+    return {
+      path: "/runtimeclasses",
+      clusterFrame: true,
+      isEnabled: isAllowedResource,
+    };
+  },
+
+  injectionToken: frontEndRouteInjectionToken,
+});
+
+export default runtimeClassesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/editor/editor-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/editor/editor-preferences-route.injectable.ts
deleted file mode 100644
index ca6cbf8a70..0000000000
--- a/src/common/front-end-routing/routes/preferences/editor/editor-preferences-route.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { computed } from "mobx";
-import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
-
-const editorPreferencesRouteInjectable = getInjectable({
-  id: "editor-preferences-route",
-
-  instantiate: () => ({
-    path: "/preferences/editor",
-    clusterFrame: false,
-    isEnabled: computed(() => true),
-  }),
-
-  injectionToken: frontEndRouteInjectionToken,
-});
-
-export default editorPreferencesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable.ts
deleted file mode 100644
index 38d25b4114..0000000000
--- a/src/common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { computed } from "mobx";
-import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
-import type { Route } from "../../../front-end-route-injection-token";
-
-interface ExtensionPreferenceRouteParams {
-  extensionId: string;
-  tabId?: string;
-}
-
-const extensionPreferencesRouteInjectable = getInjectable({
-  id: "extension-preferences-route",
-
-  instantiate: (): Route<ExtensionPreferenceRouteParams> => ({
-    path: "/preferences/extension/:extensionId/:tabId?",
-    clusterFrame: false,
-    isEnabled: computed(() => true),
-  }),
-
-  injectionToken: frontEndRouteInjectionToken,
-});
-
-export default extensionPreferencesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/extension/navigate-to-extension-preferences.injectable.ts b/src/common/front-end-routing/routes/preferences/extension/navigate-to-extension-preferences.injectable.ts
deleted file mode 100644
index 085694a578..0000000000
--- a/src/common/front-end-routing/routes/preferences/extension/navigate-to-extension-preferences.injectable.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import extensionPreferencesRouteInjectable from "./extension-preferences-route.injectable";
-import { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token";
-
-const navigateToExtensionPreferencesInjectable = getInjectable({
-  id: "navigate-to-extension-preferences",
-
-  instantiate: (di) => {
-    const navigateToRoute = di.inject(navigateToRouteInjectionToken);
-    const route = di.inject(extensionPreferencesRouteInjectable);
-
-    return (extensionId: string, tabId?: string) => navigateToRoute(route, {
-      parameters: {
-        extensionId,
-        tabId,
-      },
-      withoutAffectingBackButton: true,
-    });
-  },
-});
-
-export default navigateToExtensionPreferencesInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/kubernetes/kubernetes-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/kubernetes/kubernetes-preferences-route.injectable.ts
deleted file mode 100644
index 7b3479c7fa..0000000000
--- a/src/common/front-end-routing/routes/preferences/kubernetes/kubernetes-preferences-route.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { computed } from "mobx";
-import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
-
-const kubernetesPreferencesRouteInjectable = getInjectable({
-  id: "kubernetes-preferences-route",
-
-  instantiate: () => ({
-    path: "/preferences/kubernetes",
-    clusterFrame: false,
-    isEnabled: computed(() => true),
-  }),
-
-  injectionToken: frontEndRouteInjectionToken,
-});
-
-export default kubernetesPreferencesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/navigate-to-preferences.injectable.ts b/src/common/front-end-routing/routes/preferences/navigate-to-preferences.injectable.ts
deleted file mode 100644
index 545751d7c3..0000000000
--- a/src/common/front-end-routing/routes/preferences/navigate-to-preferences.injectable.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import navigateToAppPreferencesInjectable from "./app/navigate-to-app-preferences.injectable";
-
-const navigateToPreferencesInjectable = getInjectable({
-  id: "navigate-to-preferences",
-
-  instantiate: (di) => di.inject(navigateToAppPreferencesInjectable),
-});
-
-export default navigateToPreferencesInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/telemetry/telemetry-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/telemetry/telemetry-preferences-route.injectable.ts
deleted file mode 100644
index 2ae9f14acd..0000000000
--- a/src/common/front-end-routing/routes/preferences/telemetry/telemetry-preferences-route.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { computed } from "mobx";
-import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
-
-const telemetryPreferencesRouteInjectable = getInjectable({
-  id: "telemetry-preferences-route",
-
-  instantiate: () => ({
-    path: "/preferences/telemetry",
-    clusterFrame: false,
-    isEnabled: computed(() => true),
-  }),
-
-  injectionToken: frontEndRouteInjectionToken,
-});
-
-export default telemetryPreferencesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/terminal/terminal-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/terminal/terminal-preferences-route.injectable.ts
deleted file mode 100644
index c077c45bab..0000000000
--- a/src/common/front-end-routing/routes/preferences/terminal/terminal-preferences-route.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { computed } from "mobx";
-import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
-
-const terminalPreferencesRouteInjectable = getInjectable({
-  id: "terminal-preferences-route",
-
-  instantiate: () => ({
-    path: "/preferences/terminal",
-    clusterFrame: false,
-    isEnabled: computed(() => true),
-  }),
-
-  injectionToken: frontEndRouteInjectionToken,
-});
-
-export default terminalPreferencesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/welcome/default-welcome-route.injectable.ts b/src/common/front-end-routing/routes/welcome/default-welcome-route.injectable.ts
new file mode 100644
index 0000000000..d8db889033
--- /dev/null
+++ b/src/common/front-end-routing/routes/welcome/default-welcome-route.injectable.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import welcomeRouteConfigInjectable from "./welcome-route-config.injectable";
+import { frontEndRouteInjectionToken } from "../../front-end-route-injection-token";
+
+const defaultWelcomeRouteInjectable = getInjectable({
+  id: "default-welcome-route",
+
+  instantiate: (di) => {
+    const welcomeRoute = di.inject(welcomeRouteConfigInjectable);
+
+    return {
+      path: "/welcome",
+      clusterFrame: false,
+      isEnabled: computed(() => welcomeRoute === "/welcome"),
+    };
+  },
+
+  injectionToken: frontEndRouteInjectionToken,
+});
+
+export default defaultWelcomeRouteInjectable;
diff --git a/src/common/front-end-routing/routes/welcome/welcome-route-config.injectable.ts b/src/common/front-end-routing/routes/welcome/welcome-route-config.injectable.ts
new file mode 100644
index 0000000000..4e16df5bb4
--- /dev/null
+++ b/src/common/front-end-routing/routes/welcome/welcome-route-config.injectable.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationInformationInjectable from "../../../vars/application-information.injectable";
+
+const welcomeRouteConfigInjectable = getInjectable({
+  id: "welcome-route-config",
+
+  instantiate: (di) => di.inject(applicationInformationInjectable).config.welcomeRoute,
+});
+
+export default welcomeRouteConfigInjectable;
diff --git a/src/common/front-end-routing/routes/welcome/welcome-route.injectable.ts b/src/common/front-end-routing/routes/welcome/welcome-route.injectable.ts
index 75d722ab46..839a7446c1 100644
--- a/src/common/front-end-routing/routes/welcome/welcome-route.injectable.ts
+++ b/src/common/front-end-routing/routes/welcome/welcome-route.injectable.ts
@@ -4,16 +4,21 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
+import welcomeRouteConfigInjectable from "./welcome-route-config.injectable";
 import { frontEndRouteInjectionToken } from "../../front-end-route-injection-token";
 
 const welcomeRouteInjectable = getInjectable({
   id: "welcome-route",
 
-  instantiate: () => ({
-    path: "/welcome",
-    clusterFrame: false,
-    isEnabled: computed(() => true),
-  }),
+  instantiate: (di) => {
+    const welcomeRoute = di.inject(welcomeRouteConfigInjectable);
+
+    return {
+      path: welcomeRoute,
+      clusterFrame: false,
+      isEnabled: computed(() => true),
+    };
+  },
 
   injectionToken: frontEndRouteInjectionToken,
 });
diff --git a/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts b/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts
index 4b6776bdaa..acd1d4401d 100644
--- a/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts
+++ b/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts
@@ -5,7 +5,7 @@
 import { getDiForUnitTesting } from "../../renderer/getDiForUnitTesting";
 import { routeSpecificComponentInjectionToken } from "../../renderer/routes/route-specific-component-injection-token";
 import { frontEndRouteInjectionToken } from "./front-end-route-injection-token";
-import { filter, map, matches } from "lodash/fp";
+import { filter, map } from "lodash/fp";
 import clusterStoreInjectable from "../cluster-store/cluster-store.injectable";
 import type { ClusterStore } from "../cluster-store/cluster-store";
 import { pipeline } from "@ogre-tools/fp";
@@ -27,9 +27,11 @@ describe("verify-that-all-routes-have-component", () => {
       routes,
 
       map(
-        (route) => ({
-          path: route.path,
-          routeComponent: routeComponents.find(matches({ route })),
+        (currentRoute) => ({
+          path: currentRoute.path,
+          routeComponent: routeComponents.find(({ route }) => (
+            route.path === currentRoute.path
+            && route.clusterFrame === currentRoute.clusterFrame)),
         }),
       ),
 
diff --git a/src/common/fs/access-path.global-override-for-injectable.ts b/src/common/fs/access-path.global-override-for-injectable.ts
new file mode 100644
index 0000000000..747d839682
--- /dev/null
+++ b/src/common/fs/access-path.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import accessPathInjectable from "./access-path.injectable";
+
+export default getGlobalOverride(accessPathInjectable, () => async () => {
+  throw new Error("tried to verify path access without override");
+});
diff --git a/src/common/fs/access-path.injectable.ts b/src/common/fs/access-path.injectable.ts
new file mode 100644
index 0000000000..0504de9d6f
--- /dev/null
+++ b/src/common/fs/access-path.injectable.ts
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import fsInjectable from "./fs.injectable";
+
+export type AccessPath = (path: string, mode?: number) => Promise<boolean>;
+
+const accessPathInjectable = getInjectable({
+  id: "access-path",
+  instantiate: (di): AccessPath => {
+    const { access } = di.inject(fsInjectable);
+
+    return async (path, mode) => {
+      try {
+        await access(path, mode);
+
+        return true;
+      } catch {
+        return false;
+      }
+    };
+  },
+});
+
+export default accessPathInjectable;
diff --git a/src/common/fs/copy.global-override-for-injectable.ts b/src/common/fs/copy.global-override-for-injectable.ts
new file mode 100644
index 0000000000..b6d899d2c4
--- /dev/null
+++ b/src/common/fs/copy.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import copyInjectable from "./copy.injectable";
+
+export default getGlobalOverride(copyInjectable, () => async () => {
+  throw new Error("tried to copy filepaths without override");
+});
diff --git a/src/common/fs/copy.injectable.ts b/src/common/fs/copy.injectable.ts
new file mode 100644
index 0000000000..6a64ee3751
--- /dev/null
+++ b/src/common/fs/copy.injectable.ts
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { CopyOptions } from "fs-extra";
+import fsInjectable from "./fs.injectable";
+
+export type Copy = (src: string, dest: string, options?: CopyOptions | undefined) => Promise<void>;
+
+const copyInjectable = getInjectable({
+  id: "copy",
+  instantiate: (di): Copy => di.inject(fsInjectable).copy,
+});
+
+export default copyInjectable;
diff --git a/src/common/fs/create-read-file-stream.injectable.ts b/src/common/fs/create-read-file-stream.injectable.ts
new file mode 100644
index 0000000000..8714e1cdcd
--- /dev/null
+++ b/src/common/fs/create-read-file-stream.injectable.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { ReadStream } from "fs";
+import fsInjectable from "./fs.injectable";
+
+export interface CreateReadStreamOptions {
+  mode?: number;
+  end?: number | undefined;
+  flags?: string | undefined;
+  encoding?: BufferEncoding | undefined;
+  autoClose?: boolean | undefined;
+  /**
+   * @default false
+   */
+  emitClose?: boolean | undefined;
+  start?: number | undefined;
+  highWaterMark?: number | undefined;
+}
+
+export type CreateReadFileStream = (filePath: string, options?: CreateReadStreamOptions) => ReadStream;
+
+const createReadFileStreamInjectable = getInjectable({
+  id: "create-read-file-stream",
+  instantiate: (di): CreateReadFileStream => di.inject(fsInjectable).createReadStream,
+});
+
+export default createReadFileStreamInjectable;
diff --git a/src/common/fs/delete-file.global-override-for-injectable.ts b/src/common/fs/delete-file.global-override-for-injectable.ts
new file mode 100644
index 0000000000..c03dca88dc
--- /dev/null
+++ b/src/common/fs/delete-file.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import deleteFileInjectable from "./delete-file.injectable";
+
+export default getGlobalOverride(deleteFileInjectable, () => async () => {
+  throw new Error("tried to delete file without override");
+});
diff --git a/src/common/fs/delete-file.injectable.ts b/src/common/fs/delete-file.injectable.ts
new file mode 100644
index 0000000000..57aba5b379
--- /dev/null
+++ b/src/common/fs/delete-file.injectable.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import fsInjectable from "./fs.injectable";
+
+export type DeleteFile = (filePath: string) => Promise<void>;
+
+const deleteFileInjectable = getInjectable({
+  id: "delete-file",
+  instantiate: (di): DeleteFile => di.inject(fsInjectable).unlink,
+});
+
+export default deleteFileInjectable;
diff --git a/src/common/fs/ensure-dir.global-override-for-injectable.ts b/src/common/fs/ensure-dir.global-override-for-injectable.ts
new file mode 100644
index 0000000000..4dd098b163
--- /dev/null
+++ b/src/common/fs/ensure-dir.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import ensureDirInjectable from "./ensure-dir.injectable";
+
+export default getGlobalOverride(ensureDirInjectable, () => async () => {
+  throw new Error("tried to ensure directory without override");
+});
diff --git a/src/common/fs/ensure-dir.injectable.ts b/src/common/fs/ensure-dir.injectable.ts
index 88410ceee2..78ec4d91dc 100644
--- a/src/common/fs/ensure-dir.injectable.ts
+++ b/src/common/fs/ensure-dir.injectable.ts
@@ -5,14 +5,14 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import fsInjectable from "./fs.injectable";
 
+export type EnsureDirectory = (dirPath: string) => Promise<void>;
+
 const ensureDirInjectable = getInjectable({
   id: "ensure-dir",
 
   // TODO: Remove usages of ensureDir from business logic.
   // TODO: Read, Write, Watch etc. operations should do this internally.
-  instantiate: (di) => di.inject(fsInjectable).ensureDir,
-
-  causesSideEffects: true,
+  instantiate: (di): EnsureDirectory => di.inject(fsInjectable).ensureDir,
 });
 
 export default ensureDirInjectable;
diff --git a/src/common/fs/exec-file.injectable.ts b/src/common/fs/exec-file.injectable.ts
index 15d0ad48dc..f026e0db3a 100644
--- a/src/common/fs/exec-file.injectable.ts
+++ b/src/common/fs/exec-file.injectable.ts
@@ -3,22 +3,52 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type { ExecFileOptions } from "child_process";
+import type { ExecFileException, ExecFileOptions } from "child_process";
 import { execFile } from "child_process";
-import { promisify } from "util";
+import type { AsyncResult } from "../utils/async-result";
 
-export type ExecFile = (filePath: string, args: string[], options: ExecFileOptions) => Promise<string>;
+export type ExecFileError = ExecFileException & { stderr: string };
+
+export interface ExecFile {
+  (filePath: string): Promise<AsyncResult<string, ExecFileError>>;
+  (filePath: string, argsOrOptions: string[] | ExecFileOptions): Promise<AsyncResult<string, ExecFileError>>;
+  (filePath: string, args: string[], options: ExecFileOptions): Promise<AsyncResult<string, ExecFileError>>;
+}
 
 const execFileInjectable = getInjectable({
   id: "exec-file",
 
   instantiate: (): ExecFile => {
-    const asyncExecFile = promisify(execFile);
+    return (filePath: string, argsOrOptions?: string[] | ExecFileOptions, maybeOptions?: ExecFileOptions) => {
+      const { args, options } = (() => {
+        if (Array.isArray(argsOrOptions)) {
+          return {
+            args: argsOrOptions,
+            options: maybeOptions ?? {},
+          };
+        } else {
+          return {
+            args: [],
+            options: argsOrOptions ?? {},
+          };
+        }
+      })();
 
-    return async (filePath, args, options) => {
-      const result = await asyncExecFile(filePath, args, options);
-
-      return result.stdout;
+      return new Promise((resolve) => {
+        execFile(filePath, args, options, (error, stdout, stderr) => {
+          if (error) {
+            resolve({
+              callWasSuccessful: false,
+              error: Object.assign(error, { stderr }),
+            });
+          } else {
+            resolve({
+              callWasSuccessful: true,
+              response: stdout,
+            });
+          }
+        });
+      });
     };
   },
 
diff --git a/src/common/fs/extract-tar.global-override-for-injectable.ts b/src/common/fs/extract-tar.global-override-for-injectable.ts
new file mode 100644
index 0000000000..02a46c1d6b
--- /dev/null
+++ b/src/common/fs/extract-tar.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import extractTarInjectable from "./extract-tar.injectable";
+
+export default getGlobalOverride(extractTarInjectable, () => async () => {
+  throw new Error("tried to extract a tar file without override");
+});
diff --git a/src/common/fs/extract-tar.injectable.ts b/src/common/fs/extract-tar.injectable.ts
new file mode 100644
index 0000000000..410512139e
--- /dev/null
+++ b/src/common/fs/extract-tar.injectable.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { ExtractOptions } from "tar";
+import { extract } from "tar";
+import getDirnameOfPathInjectable from "../path/get-dirname.injectable";
+
+export type ExtractTar = (filePath: string, opts?: ExtractOptions) => Promise<void>;
+
+const extractTarInjectable = getInjectable({
+  id: "extract-tar",
+  instantiate: (di): ExtractTar => {
+    const getDirnameOfPath = di.inject(getDirnameOfPathInjectable);
+
+    return (filePath, opts = {}) => extract({
+      file: filePath,
+      cwd: getDirnameOfPath(filePath),
+      ...opts,
+    });
+  },
+  causesSideEffects: true,
+});
+
+export default extractTarInjectable;
diff --git a/src/common/fs/lstat.global-override-for-injectable.ts b/src/common/fs/lstat.global-override-for-injectable.ts
new file mode 100644
index 0000000000..9c9f3d4933
--- /dev/null
+++ b/src/common/fs/lstat.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import lstatInjectable from "./lstat.injectable";
+
+export default getGlobalOverride(lstatInjectable, () => async () => {
+  throw new Error("tried to lstat a filepath without override");
+});
diff --git a/src/common/fs/lstat.injectable.ts b/src/common/fs/lstat.injectable.ts
new file mode 100644
index 0000000000..50c1d4ad12
--- /dev/null
+++ b/src/common/fs/lstat.injectable.ts
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { Stats } from "fs";
+import fsInjectable from "./fs.injectable";
+
+export type LStat = (path: string) => Promise<Stats>;
+
+const lstatInjectable = getInjectable({
+  id: "lstat",
+  instantiate: (di): LStat => di.inject(fsInjectable).lstat,
+});
+
+export default lstatInjectable;
diff --git a/src/common/fs/move.global-override-for-injectable.ts b/src/common/fs/move.global-override-for-injectable.ts
new file mode 100644
index 0000000000..c39907ee6e
--- /dev/null
+++ b/src/common/fs/move.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import moveInjectable from "./move.injectable";
+
+export default getGlobalOverride(moveInjectable, () => async () => {
+  throw new Error("tried to move without override");
+});
diff --git a/src/common/fs/move.injectable.ts b/src/common/fs/move.injectable.ts
new file mode 100644
index 0000000000..ff11120d80
--- /dev/null
+++ b/src/common/fs/move.injectable.ts
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { MoveOptions } from "fs-extra";
+import fsInjectable from "./fs.injectable";
+
+export type Move = (src: string, dest: string, options?: MoveOptions) => Promise<void>;
+
+const moveInjectable = getInjectable({
+  id: "move",
+  instantiate: (di): Move => di.inject(fsInjectable).move,
+});
+
+export default moveInjectable;
diff --git a/src/common/fs/path-exists.global-override-for-injectable.ts b/src/common/fs/path-exists.global-override-for-injectable.ts
new file mode 100644
index 0000000000..1b9b96c8dd
--- /dev/null
+++ b/src/common/fs/path-exists.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import pathExistsInjectable from "./path-exists.injectable";
+
+export default getGlobalOverride(pathExistsInjectable, () => async () => {
+  throw new Error("Tried to check if a path exists without override");
+});
diff --git a/src/common/fs/read-directory.global-override-for-injectable.ts b/src/common/fs/read-directory.global-override-for-injectable.ts
new file mode 100644
index 0000000000..57c83ceffb
--- /dev/null
+++ b/src/common/fs/read-directory.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import readDirectoryInjectable from "./read-directory.injectable";
+
+export default getGlobalOverride(readDirectoryInjectable, () => async () => {
+  throw new Error("tried to read a directory's content without override");
+});
diff --git a/src/common/fs/read-directory.injectable.ts b/src/common/fs/read-directory.injectable.ts
new file mode 100644
index 0000000000..57632bd4d7
--- /dev/null
+++ b/src/common/fs/read-directory.injectable.ts
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { Dirent } from "fs";
+import fsInjectable from "./fs.injectable";
+
+export interface ReadDirectory {
+  (
+    path: string,
+    options: "buffer" | { encoding: "buffer"; withFileTypes?: false | undefined }
+  ): Promise<Buffer[]>;
+  (
+    path: string,
+    options?:
+      | { encoding: BufferEncoding | string | null; withFileTypes?: false | undefined }
+      | BufferEncoding
+      | string
+      | null,
+  ): Promise<string[]>;
+  (
+    path: string,
+    options?: { encoding?: BufferEncoding | string | null | undefined; withFileTypes?: false | undefined },
+  ): Promise<string[] | Buffer[]>;
+  (
+    path: string,
+    options: { encoding?: BufferEncoding | string | null | undefined; withFileTypes: true },
+  ): Promise<Dirent[]>;
+}
+
+const readDirectoryInjectable = getInjectable({
+  id: "read-directory",
+  instantiate: (di): ReadDirectory => di.inject(fsInjectable).readdir,
+});
+
+export default readDirectoryInjectable;
diff --git a/src/common/fs/read-file.injectable.ts b/src/common/fs/read-file.injectable.ts
index b0a2b7233e..0dc539e1b1 100644
--- a/src/common/fs/read-file.injectable.ts
+++ b/src/common/fs/read-file.injectable.ts
@@ -5,11 +5,16 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import fsInjectable from "./fs.injectable";
 
+export type ReadFile = (filePath: string) => Promise<string>;
+
 const readFileInjectable = getInjectable({
   id: "read-file",
 
-  instantiate: (di) => (filePath: string) =>
-    di.inject(fsInjectable).readFile(filePath, "utf-8"),
+  instantiate: (di): ReadFile => {
+    const { readFile } = di.inject(fsInjectable);
+
+    return (filePath) => readFile(filePath, "utf-8");
+  },
 });
 
 export default readFileInjectable;
diff --git a/src/common/fs/remove-path.global-override-for-injectable.ts b/src/common/fs/remove-path.global-override-for-injectable.ts
new file mode 100644
index 0000000000..5b9720a837
--- /dev/null
+++ b/src/common/fs/remove-path.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import removePathInjectable from "./remove-path.injectable";
+
+export default getGlobalOverride(removePathInjectable, () => async () => {
+  throw new Error("tried to remove a path without override");
+});
diff --git a/src/common/fs/read-dir.injectable.ts b/src/common/fs/remove-path.injectable.ts
similarity index 52%
rename from src/common/fs/read-dir.injectable.ts
rename to src/common/fs/remove-path.injectable.ts
index 2c7b59d9b2..02c8da0e1e 100644
--- a/src/common/fs/read-dir.injectable.ts
+++ b/src/common/fs/remove-path.injectable.ts
@@ -5,9 +5,11 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import fsInjectable from "./fs.injectable";
 
-const readDirInjectable = getInjectable({
-  id: "read-dir",
-  instantiate: (di) => di.inject(fsInjectable).readdir,
+export type RemovePath = (path: string) => Promise<void>;
+
+const removePathInjectable = getInjectable({
+  id: "remove-path",
+  instantiate: (di): RemovePath => di.inject(fsInjectable).remove,
 });
 
-export default readDirInjectable;
+export default removePathInjectable;
diff --git a/src/common/fs/stat/stat.injectable.ts b/src/common/fs/stat/stat.injectable.ts
index aa1ce44447..e9924fc088 100644
--- a/src/common/fs/stat/stat.injectable.ts
+++ b/src/common/fs/stat/stat.injectable.ts
@@ -3,12 +3,14 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
+import type { Stats } from "fs";
 import fsInjectable from "../fs.injectable";
 
+export type Stat = (path: string) => Promise<Stats>;
+
 const statInjectable = getInjectable({
   id: "stat",
-
-  instantiate: (di) => di.inject(fsInjectable).stat,
+  instantiate: (di): Stat => di.inject(fsInjectable).stat,
 });
 
 export default statInjectable;
diff --git a/src/common/fs/watch/watch.injectable.ts b/src/common/fs/watch/watch.injectable.ts
index 44d34f20f5..50f96cdf57 100644
--- a/src/common/fs/watch/watch.injectable.ts
+++ b/src/common/fs/watch/watch.injectable.ts
@@ -3,15 +3,161 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type { FSWatcher, WatchOptions } from "chokidar";
 import { watch } from "chokidar";
+import type { Stats } from "fs";
+import type TypedEventEmitter from "typed-emitter";
+import type { SingleOrMany } from "../../utils";
 
-export type Watch = (path: string, options?: WatchOptions) => FSWatcher;
+export interface AlwaysStatWatcherEvents {
+  add: (path: string, stats: Stats) => void;
+  addDir: (path: string, stats: Stats) => void;
+  change: (path: string, stats: Stats) => void;
+}
+
+export interface MaybeStatWatcherEvents {
+  add: (path: string, stats?: Stats) => void;
+  addDir: (path: string, stats?: Stats) => void;
+  change: (path: string, stats?: Stats) => void;
+}
+
+export type WatcherEvents<AlwaysStat extends boolean> = BaseWatcherEvents
+  & (
+    AlwaysStat extends true
+      ? AlwaysStatWatcherEvents
+      : MaybeStatWatcherEvents
+  );
+
+export interface BaseWatcherEvents {
+  error: (error: Error) => void;
+  ready: () => void;
+  unlink: (path: string) => void;
+  unlinkDir: (path: string) => void;
+}
+
+export interface Watcher<AlwaysStat extends boolean> extends TypedEventEmitter<WatcherEvents<AlwaysStat>> {
+  close: () => Promise<void>;
+}
+
+export type WatcherOptions<AlwaysStat extends boolean> = {
+  /**
+   * Indicates whether the process should continue to run as long as files are being watched. If
+   * set to `false` when using `fsevents` to watch, no more events will be emitted after `ready`,
+   * even if the process continues to run.
+   */
+  persistent?: boolean;
+
+  /**
+   * ([anymatch](https://github.com/micromatch/anymatch)-compatible definition) Defines files/paths to
+   * be ignored. The whole relative or absolute path is tested, not just filename. If a function
+   * with two arguments is provided, it gets called twice per path - once with a single argument
+   * (the path), second time with two arguments (the path and the
+   * [`fs.Stats`](https://nodejs.org/api/fs.html#fs_class_fs_stats) object of that path).
+   */
+  ignored?: SingleOrMany<string | RegExp | ((path: string) => boolean)>;
+
+  /**
+   * If set to `false` then `add`/`addDir` events are also emitted for matching paths while
+   * instantiating the watching as chokidar discovers these file paths (before the `ready` event).
+   */
+  ignoreInitial?: boolean;
+
+  /**
+   * When `false`, only the symlinks themselves will be watched for changes instead of following
+   * the link references and bubbling events through the link's path.
+   */
+  followSymlinks?: boolean;
+
+  /**
+   * The base directory from which watch `paths` are to be derived. Paths emitted with events will
+   * be relative to this.
+   */
+  cwd?: string;
+
+  /**
+   *  If set to true then the strings passed to .watch() and .add() are treated as literal path
+   *  names, even if they look like globs. Default: false.
+   */
+  disableGlobbing?: boolean;
+
+  /**
+   * Whether to use fs.watchFile (backed by polling), or fs.watch. If polling leads to high CPU
+   * utilization, consider setting this to `false`. It is typically necessary to **set this to
+   * `true` to successfully watch files over a network**, and it may be necessary to successfully
+   * watch files in other non-standard situations. Setting to `true` explicitly on OS X overrides
+   * the `useFsEvents` default.
+   */
+  usePolling?: boolean;
+
+  /**
+   * Whether to use the `fsevents` watching interface if available. When set to `true` explicitly
+   * and `fsevents` is available this supercedes the `usePolling` setting. When set to `false` on
+   * OS X, `usePolling: true` becomes the default.
+   */
+  useFsEvents?: boolean;
+
+  /**
+   * If set, limits how many levels of subdirectories will be traversed.
+   */
+  depth?: number;
+
+  /**
+   * Interval of file system polling.
+   */
+  interval?: number;
+
+  /**
+   * Interval of file system polling for binary files. ([see list of binary extensions](https://gi
+   * thub.com/sindresorhus/binary-extensions/blob/master/binary-extensions.json))
+   */
+  binaryInterval?: number;
+
+  /**
+   *  Indicates whether to watch files that don't have read permissions if possible. If watching
+   *  fails due to `EPERM` or `EACCES` with this set to `true`, the errors will be suppressed
+   *  silently.
+   */
+  ignorePermissionErrors?: boolean;
+
+  /**
+   * `true` if `useFsEvents` and `usePolling` are `false`). Automatically filters out artifacts
+   * that occur when using editors that use "atomic writes" instead of writing directly to the
+   * source file. If a file is re-added within 100 ms of being deleted, Chokidar emits a `change`
+   * event rather than `unlink` then `add`. If the default of 100 ms does not work well for you,
+   * you can override it by setting `atomic` to a custom value, in milliseconds.
+   */
+  atomic?: boolean | number;
+
+  /**
+   * can be set to an object in order to adjust timing params:
+   */
+  awaitWriteFinish?: AwaitWriteFinishOptions | boolean;
+} & (AlwaysStat extends true
+  ? {
+    alwaysStat: true;
+  }
+  : {
+    alwaysStat?: false;
+  }
+);
+
+export interface AwaitWriteFinishOptions {
+  /**
+   * Amount of time in milliseconds for a file size to remain constant before emitting its event.
+   */
+  stabilityThreshold?: number;
+
+  /**
+   * File size polling interval.
+   */
+  pollInterval?: number;
+}
+
+export type Watch = <AlwaysStat extends boolean = false>(path: string, options?: WatcherOptions<AlwaysStat>) => Watcher<AlwaysStat>;
 
 // TODO: Introduce wrapper to allow simpler API
 const watchInjectable = getInjectable({
   id: "watch",
-  instantiate: (): Watch => watch,
+  instantiate: () => watch as Watch,
   causesSideEffects: true,
 });
 
diff --git a/src/common/fs/write-file.global-override-for-injectable.ts b/src/common/fs/write-file.global-override-for-injectable.ts
new file mode 100644
index 0000000000..c8b7ef8e45
--- /dev/null
+++ b/src/common/fs/write-file.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import writeFileInjectable from "./write-file.injectable";
+
+export default getGlobalOverride(writeFileInjectable, () => async () => {
+  throw new Error("tried to write file without override");
+});
diff --git a/src/common/fs/write-file.injectable.ts b/src/common/fs/write-file.injectable.ts
index 70dcb76373..faa5285ca1 100644
--- a/src/common/fs/write-file.injectable.ts
+++ b/src/common/fs/write-file.injectable.ts
@@ -3,20 +3,28 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import path from "path";
+import type { WriteFileOptions } from "fs-extra";
+import getDirnameOfPathInjectable from "../path/get-dirname.injectable";
 import fsInjectable from "./fs.injectable";
 
+export type WriteFile = (filePath: string, content: string | Buffer, opts?: WriteFileOptions) => Promise<void>;
+
 const writeFileInjectable = getInjectable({
   id: "write-file",
 
-  instantiate: (di) => {
+  instantiate: (di): WriteFile => {
     const { writeFile, ensureDir } = di.inject(fsInjectable);
+    const getDirnameOfPath = di.inject(getDirnameOfPathInjectable);
 
-    return async (filePath: string, content: string | Buffer) => {
-      await ensureDir(path.dirname(filePath), { mode: 0o755 });
+    return async (filePath, content, opts) => {
+      await ensureDir(getDirnameOfPath(filePath), {
+        mode: 0o755,
+        ...(opts ?? {}),
+      });
 
       await writeFile(filePath, content, {
         encoding: "utf-8",
+        ...(opts ?? {}),
       });
     };
   },
diff --git a/src/common/fs/write-json-file.injectable.ts b/src/common/fs/write-json-file.injectable.ts
index 6d05e01a7c..a7079d7f84 100644
--- a/src/common/fs/write-json-file.injectable.ts
+++ b/src/common/fs/write-json-file.injectable.ts
@@ -3,37 +3,27 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type { EnsureOptions, WriteOptions } from "fs-extra";
-import path from "path";
 import type { JsonValue } from "type-fest";
+import getDirnameOfPathInjectable from "../path/get-dirname.injectable";
 import fsInjectable from "./fs.injectable";
 
 export type WriteJson = (filePath: string, contents: JsonValue) => Promise<void>;
 
-interface Dependencies {
-  writeJson: (file: string, object: any, options?: WriteOptions | BufferEncoding | string) => Promise<void>;
-  ensureDir: (dir: string, options?: EnsureOptions | number) => Promise<void>;
-}
-
-const writeJsonFile = ({ writeJson, ensureDir }: Dependencies): WriteJson => async (filePath, content) => {
-  await ensureDir(path.dirname(filePath), { mode: 0o755 });
-
-  await writeJson(filePath, content, {
-    encoding: "utf-8",
-    spaces: 2,
-  });
-};
-
 const writeJsonFileInjectable = getInjectable({
   id: "write-json-file",
 
-  instantiate: (di) => {
+  instantiate: (di): WriteJson => {
     const { writeJson, ensureDir } = di.inject(fsInjectable);
+    const getDirnameOfPath = di.inject(getDirnameOfPathInjectable);
 
-    return writeJsonFile({
-      writeJson,
-      ensureDir,
-    });
+    return async (filePath, content) => {
+      await ensureDir(getDirnameOfPath(filePath), { mode: 0o755 });
+
+      await writeJson(filePath, content, {
+        encoding: "utf-8",
+        spaces: 2,
+      });
+    };
   },
 });
 
diff --git a/src/common/helm/add-helm-repository-channel.injectable.ts b/src/common/helm/add-helm-repository-channel.injectable.ts
deleted file mode 100644
index 0bc10564ad..0000000000
--- a/src/common/helm/add-helm-repository-channel.injectable.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { HelmRepo } from "./helm-repo";
-import type { RequestChannel } from "../utils/channel/request-channel-injection-token";
-import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token";
-import type { AsyncResult } from "../utils/async-result";
-
-export type AddHelmRepositoryChannel = RequestChannel<HelmRepo, AsyncResult<string>>;
-
-const addHelmRepositoryChannelInjectable = getInjectable({
-  id: "add-helm-repository-channel",
-
-  instantiate: (): AddHelmRepositoryChannel => ({
-    id: "add-helm-repository-channel",
-  }),
-
-  injectionToken: requestChannelInjectionToken,
-});
-
-export default addHelmRepositoryChannelInjectable;
diff --git a/src/common/helm/add-helm-repository-channel.ts b/src/common/helm/add-helm-repository-channel.ts
new file mode 100644
index 0000000000..bf5aa19367
--- /dev/null
+++ b/src/common/helm/add-helm-repository-channel.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { HelmRepo } from "./helm-repo";
+import type { AsyncResult } from "../utils/async-result";
+import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+
+export type AddHelmRepositoryChannel = RequestChannel<HelmRepo, AsyncResult<void, string>>;
+
+export const addHelmRepositoryChannel: AddHelmRepositoryChannel = {
+  id: "add-helm-repository-channel",
+};
diff --git a/src/common/helm/get-active-helm-repositories-channel.injectable.ts b/src/common/helm/get-active-helm-repositories-channel.injectable.ts
deleted file mode 100644
index ac7355ace7..0000000000
--- a/src/common/helm/get-active-helm-repositories-channel.injectable.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { RequestChannel } from "../utils/channel/request-channel-injection-token";
-import type { HelmRepo } from "./helm-repo";
-import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token";
-import type { AsyncResult } from "../utils/async-result";
-
-export type GetHelmRepositoriesChannel = RequestChannel<void, AsyncResult<HelmRepo[]>>;
-
-const getActiveHelmRepositoriesChannelInjectable = getInjectable({
-  id: "get-active-helm-repositories-channel",
-
-  instantiate: (): GetHelmRepositoriesChannel => ({
-    id: "get-helm-active-list-repositories",
-  }),
-
-  injectionToken: requestChannelInjectionToken,
-});
-
-export default getActiveHelmRepositoriesChannelInjectable;
diff --git a/src/common/helm/get-active-helm-repositories-channel.ts b/src/common/helm/get-active-helm-repositories-channel.ts
new file mode 100644
index 0000000000..26720e9a5f
--- /dev/null
+++ b/src/common/helm/get-active-helm-repositories-channel.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { HelmRepo } from "./helm-repo";
+import type { AsyncResult } from "../utils/async-result";
+import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+
+export type GetActiveHelmRepositoriesChannel = RequestChannel<void, AsyncResult<HelmRepo[]>>;
+
+export const getActiveHelmRepositoriesChannel: GetActiveHelmRepositoriesChannel = {
+  id: "get-helm-active-list-repositories",
+};
diff --git a/src/common/helm/remove-helm-repository-channel.injectable.ts b/src/common/helm/remove-helm-repository-channel.injectable.ts
deleted file mode 100644
index eddecb1ccd..0000000000
--- a/src/common/helm/remove-helm-repository-channel.injectable.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { HelmRepo } from "./helm-repo";
-import type { RequestChannel } from "../utils/channel/request-channel-injection-token";
-import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token";
-
-export type RemoveHelmRepositoryChannel = RequestChannel<HelmRepo>;
-
-const removeHelmRepositoryChannelInjectable = getInjectable({
-  id: "remove-helm-repository-channel",
-
-  instantiate: (): RemoveHelmRepositoryChannel => ({
-    id: "remove-helm-repository-channel",
-  }),
-
-  injectionToken: requestChannelInjectionToken,
-});
-
-export default removeHelmRepositoryChannelInjectable;
diff --git a/src/common/helm/remove-helm-repository-channel.ts b/src/common/helm/remove-helm-repository-channel.ts
new file mode 100644
index 0000000000..4d479d088c
--- /dev/null
+++ b/src/common/helm/remove-helm-repository-channel.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { AsyncResult } from "../utils/async-result";
+import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+import type { HelmRepo } from "./helm-repo";
+
+export type RemoveHelmRepositoryChannel = RequestChannel<HelmRepo, AsyncResult<void, string>>;
+
+export const removeHelmRepositoryChannel: RemoveHelmRepositoryChannel = {
+  id: "remove-helm-repository-channel",
+};
diff --git a/src/common/initializable-state/create.test.ts b/src/common/initializable-state/create.test.ts
new file mode 100644
index 0000000000..38980b0a41
--- /dev/null
+++ b/src/common/initializable-state/create.test.ts
@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { AsyncFnMock } from "@async-fn/jest";
+import asyncFn from "@async-fn/jest";
+import type { DiContainer, Injectable } from "@ogre-tools/injectable";
+import { runInAction } from "mobx";
+import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
+import type { InitializableState } from "./create";
+import { createInitializableState } from "./create";
+
+describe("InitializableState tests", () => {
+  let di: DiContainer;
+
+  beforeEach(() => {
+    di = getDiForUnitTesting({ doGeneralOverrides: true });
+  });
+
+  describe("when created", () => {
+    let stateInjectable: Injectable<InitializableState<number>, unknown, void>;
+    let initMock: AsyncFnMock<() => number>;
+
+    beforeEach(() => {
+      initMock = asyncFn();
+      stateInjectable = createInitializableState({
+        id: "my-state",
+        init: initMock,
+      });
+
+      runInAction(() => {
+        di.register(stateInjectable);
+      });
+    });
+
+    describe("when injected", () => {
+      let state: InitializableState<number>;
+
+      beforeEach(() => {
+        state = di.inject(stateInjectable);
+      });
+
+      it("when get is called, throw", () => {
+        expect(() => state.get()).toThrowError("InitializableState(my-state) has not been initialized yet");
+      });
+
+      describe("when init is called", () => {
+        beforeEach(() => {
+          state.init();
+        });
+
+        it("should call provided initialization function", () => {
+          expect(initMock).toBeCalled();
+        });
+
+        it("when get is called, throw", () => {
+          expect(() => state.get()).toThrowError("InitializableState(my-state) has not finished initializing");
+        });
+
+        describe("when initialization resolves", () => {
+          beforeEach(async () => {
+            await initMock.resolve(42);
+          });
+
+          it("when get is called, returns value", () => {
+            expect(state.get()).toBe(42);
+          });
+
+          it("when init is called again, throws", async () => {
+            await expect(() => state.init()).rejects.toThrow("Cannot initialize InitializableState(my-state) more than once");
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/src/common/initializable-state/create.ts b/src/common/initializable-state/create.ts
new file mode 100644
index 0000000000..829de57d94
--- /dev/null
+++ b/src/common/initializable-state/create.ts
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { DiContainerForInjection, Injectable, InjectionToken } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
+
+export interface CreateInitializableStateArgs<T> {
+  id: string;
+  init: (di: DiContainerForInjection) => Promise<T> | T;
+  injectionToken?: InjectionToken<InitializableState<T>, void>;
+}
+
+export interface InitializableState<T> {
+  get: () => T;
+  init: () => Promise<void>;
+}
+
+type InitializableStateValue<T> =
+  | { set: false }
+  | { set: true; value: T } ;
+
+export function createInitializableState<T>(args: CreateInitializableStateArgs<T>): Injectable<InitializableState<T>, unknown, void> {
+  const { id, init, injectionToken } = args;
+
+  return getInjectable({
+    id,
+    instantiate: (di) => {
+      let box: InitializableStateValue<T> = {
+        set: false,
+      };
+      let initCalled = false;
+
+      return {
+        init: async () => {
+          if (initCalled) {
+            throw new Error(`Cannot initialize InitializableState(${id}) more than once`);
+          }
+
+          initCalled = true;
+          box = {
+            set: true,
+            value: await init(di),
+          };
+        },
+        get: () => {
+          if (!initCalled) {
+            throw new Error(`InitializableState(${id}) has not been initialized yet`);
+          }
+
+          if (box.set === false) {
+            throw new Error(`InitializableState(${id}) has not finished initializing`);
+          }
+
+          return box.value;
+        },
+      };
+    },
+    injectionToken,
+  });
+}
diff --git a/src/common/ipc/__tests__/type-enforced-ipc.test.ts b/src/common/ipc/__tests__/type-enforced-ipc.test.ts
deleted file mode 100644
index bd456257cb..0000000000
--- a/src/common/ipc/__tests__/type-enforced-ipc.test.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { EventEmitter } from "events";
-import { onCorrect, onceCorrect } from "../type-enforced-ipc";
-
-describe("type enforced ipc tests", () => {
-  describe("onCorrect tests", () => {
-    it("should call the handler if the args are valid", () => {
-      let called = false;
-      const source = new EventEmitter();
-      const listener = () => called = true;
-      const verifier = (args: unknown[]): args is [] => true;
-      const channel = "foobar";
-
-      onCorrect({ source, listener, verifier, channel });
-
-      source.emit(channel);
-      expect(called).toBe(true);
-    });
-
-    it("should not call the handler if the args are not valid", () => {
-      let called = false;
-      const source = new EventEmitter();
-      const listener = () => called = true;
-      const verifier = (args: unknown[]): args is [] => false;
-      const channel = "foobar";
-
-      onCorrect({ source, listener, verifier, channel });
-
-      source.emit(channel);
-      expect(called).toBe(false);
-    });
-
-    it("should call the handler twice if the args are valid on two emits", () => {
-      let called = 0;
-      const source = new EventEmitter();
-      const listener = () => called += 1;
-      const verifier = (args: unknown[]): args is [] => true;
-      const channel = "foobar";
-
-      onCorrect({ source, listener, verifier, channel });
-
-      source.emit(channel);
-      source.emit(channel);
-      expect(called).toBe(2);
-    });
-
-    it("should call the handler twice if the args are [valid, invalid, valid]", () => {
-      let called = 0;
-      const source = new EventEmitter();
-      const listener = () => called += 1;
-      const results = [true, false, true];
-      const verifier = (args: unknown[]): args is [] => results.pop() ?? false;
-      const channel = "foobar";
-
-      onCorrect({ source, listener, verifier, channel });
-
-      source.emit(channel);
-      source.emit(channel);
-      source.emit(channel);
-      expect(called).toBe(2);
-    });
-  });
-
-  describe("onceCorrect tests", () => {
-    it("should call the handler if the args are valid", () => {
-      let called = false;
-      const source = new EventEmitter();
-      const listener = () => called = true;
-      const verifier = (args: unknown[]): args is [] => true;
-      const channel = "foobar";
-
-      onceCorrect({ source, listener, verifier, channel });
-
-      source.emit(channel);
-      expect(called).toBe(true);
-    });
-
-    it("should not call the handler if the args are not valid", () => {
-      let called = false;
-      const source = new EventEmitter();
-      const listener = () => called = true;
-      const verifier = (args: unknown[]): args is [] => false;
-      const channel = "foobar";
-
-      onceCorrect({ source, listener, verifier, channel });
-
-      source.emit(channel);
-      expect(called).toBe(false);
-    });
-
-    it("should call the handler only once even if args are valid multiple times", () => {
-      let called = 0;
-      const source = new EventEmitter();
-      const listener = () => called += 1;
-      const verifier = (args: unknown[]): args is [] => true;
-      const channel = "foobar";
-
-      onceCorrect({ source, listener, verifier, channel });
-
-      source.emit(channel);
-      source.emit(channel);
-      expect(called).toBe(1);
-    });
-
-    it("should call the handler on only the first valid set of args", () => {
-      let called = "";
-      let verifierCalled = 0;
-      const source = new EventEmitter();
-      const listener = (info: any, arg: string) => called = arg;
-      const verifier = (args: unknown[]): args is [string] => (++verifierCalled) % 3 === 0;
-      const channel = "foobar";
-
-      onceCorrect({ source, listener, verifier, channel });
-
-      source.emit(channel, {}, "a");
-      source.emit(channel, {}, "b");
-      source.emit(channel, {}, "c");
-      source.emit(channel, {}, "d");
-      source.emit(channel, {}, "e");
-      source.emit(channel, {}, "f");
-      source.emit(channel, {}, "g");
-      source.emit(channel, {}, "h");
-      source.emit(channel, {}, "i");
-      expect(called).toBe("c");
-    });
-  });
-});
diff --git a/src/common/ipc/cluster.ts b/src/common/ipc/cluster.ts
index 9f69ff42d5..53061abf60 100644
--- a/src/common/ipc/cluster.ts
+++ b/src/common/ipc/cluster.ts
@@ -6,13 +6,7 @@
 export const clusterActivateHandler = "cluster:activate";
 export const clusterSetFrameIdHandler = "cluster:set-frame-id";
 export const clusterVisibilityHandler = "cluster:visibility";
-export const clusterRefreshHandler = "cluster:refresh";
 export const clusterDisconnectHandler = "cluster:disconnect";
-export const clusterDeleteHandler = "cluster:delete";
-export const clusterSetDeletingHandler = "cluster:deleting:set";
-export const clusterClearDeletingHandler = "cluster:deleting:clear";
-export const clusterKubectlApplyAllHandler = "cluster:kubectl-apply-all";
-export const clusterKubectlDeleteAllHandler = "cluster:kubectl-delete-all";
 export const clusterStates = "cluster:states";
 
 /**
diff --git a/src/common/ipc/index.ts b/src/common/ipc/index.ts
index bb60ce4f6c..aa2a538560 100644
--- a/src/common/ipc/index.ts
+++ b/src/common/ipc/index.ts
@@ -5,4 +5,3 @@
 
 export * from "./ipc";
 export * from "./invalid-kubeconfig";
-export * from "./type-enforced-ipc";
diff --git a/src/common/ipc/type-enforced-ipc.ts b/src/common/ipc/type-enforced-ipc.ts
deleted file mode 100644
index d37dce2f85..0000000000
--- a/src/common/ipc/type-enforced-ipc.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { EventEmitter } from "events";
-import { ipcMain } from "electron";
-import logger from "../../main/logger";
-import type { Disposer } from "../utils";
-import { ipcMainHandle } from "./ipc";
-
-export type ListenerEvent<EM extends EventEmitter> = Parameters<Parameters<EM["on"]>[1]>[0];
-export type ListVerifier<T extends any[]> = (args: unknown[]) => args is T;
-export type Rest<T> = T extends [any, ...infer R] ? R : [];
-
-/**
- * Adds a listener to `source` that waits for the first IPC message with the correct
- * argument data is sent.
- * @param channel The channel to be listened on
- * @param listener The function for the channel to be called if the args of the correct type
- * @param verifier The function to be called to verify that the args are the correct type
- */
-export function onceCorrect<
-  IPC extends EventEmitter,
-  Listener extends (event: ListenerEvent<IPC>, ...args: any[]) => any,
->({
-  source,
-  channel,
-  listener,
-  verifier,
-}: {
-  source: IPC;
-  channel: string;
-  listener: Listener;
-  verifier: ListVerifier<Rest<Parameters<Listener>>>;
-}): void {
-  function wrappedListener(event: ListenerEvent<IPC>, ...args: unknown[]): void {
-    if (verifier(args)) {
-      source.removeListener(channel, wrappedListener); // remove immediately
-
-      (async () => (listener(event, ...args)))() // might return a promise, or throw, or reject
-        .catch((error: any) => logger.error("[IPC]: channel once handler threw error", { channel, error }));
-    } else {
-      logger.error("[IPC]: channel was emitted with invalid data", { channel, args });
-    }
-  }
-
-  source.on(channel, wrappedListener);
-}
-
-/**
- * Adds a listener to `source` that checks to verify the arguments before calling the handler.
- * @param channel The channel to be listened on
- * @param listener The function for the channel to be called if the args of the correct type
- * @param verifier The function to be called to verify that the args are the correct type
- */
-export function onCorrect<
-  IPC extends EventEmitter,
-  Listener extends (event: ListenerEvent<IPC>, ...args: any[]) => any,
->({
-  source,
-  channel,
-  listener,
-  verifier,
-}: {
-  source: IPC;
-  channel: string;
-  listener: Listener;
-  verifier: ListVerifier<Rest<Parameters<Listener>>>;
-}): Disposer {
-  function wrappedListener(event: ListenerEvent<IPC>, ...args: unknown[]) {
-    if (verifier(args)) {
-      (async () => (listener(event, ...args)))() // might return a promise, or throw, or reject
-        .catch(error => logger.error("[IPC]: channel on handler threw error", { channel, error }));
-    } else {
-      logger.error("[IPC]: channel was emitted with invalid data", { channel, args });
-    }
-  }
-
-  source.on(channel, wrappedListener);
-
-  return () => source.off(channel, wrappedListener);
-}
-
-export function handleCorrect<
-  Handler extends (event: Electron.IpcMainInvokeEvent, ...args: any[]) => any,
->({
-  channel,
-  handler,
-  verifier,
-}: {
-  channel: string;
-  handler: Handler;
-  verifier: ListVerifier<Rest<Parameters<Handler>>>;
-}): Disposer {
-  function wrappedHandler(event: Electron.IpcMainInvokeEvent, ...args: unknown[]): ReturnType<Handler> {
-    if (verifier(args)) {
-      return handler(event, ...args);
-    }
-
-    throw new TypeError(`Invalid args for invoke on channel: ${channel}`);
-  }
-
-  ipcMainHandle(channel, wrappedHandler);
-
-  return () => ipcMain.removeHandler(channel);
-}
diff --git a/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts b/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts
new file mode 100644
index 0000000000..eb13464716
--- /dev/null
+++ b/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts
@@ -0,0 +1,719 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { KubeJsonApi } from "../kube-json-api";
+import { PassThrough } from "stream";
+import type { ApiManager } from "../api-manager";
+import { Ingress, IngressApi } from "../endpoints";
+import { getDiForUnitTesting } from "../../../renderer/getDiForUnitTesting";
+import apiManagerInjectable from "../api-manager/manager.injectable";
+import autoRegistrationInjectable from "../api-manager/auto-registration.injectable";
+import type { Fetch } from "../../fetch/fetch.injectable";
+import fetchInjectable from "../../fetch/fetch.injectable";
+import type { AsyncFnMock } from "@async-fn/jest";
+import asyncFn from "@async-fn/jest";
+import { flushPromises } from "../../test-utils/flush-promises";
+import createKubeJsonApiInjectable from "../create-kube-json-api.injectable";
+import type { Response, Headers as NodeFetchHeaders } from "node-fetch";
+
+const createMockResponseFromString = (url: string, data: string, statusCode = 200) => {
+  const res: jest.Mocked<Response> = {
+    buffer: jest.fn(async () => { throw new Error("buffer() is not supported"); }),
+    clone: jest.fn(() => res),
+    arrayBuffer: jest.fn(async () => { throw new Error("arrayBuffer() is not supported"); }),
+    blob: jest.fn(async () => { throw new Error("blob() is not supported"); }),
+    body: new PassThrough(),
+    bodyUsed: false,
+    headers: new Headers() as NodeFetchHeaders,
+    json: jest.fn(async () => JSON.parse(await res.text())),
+    ok: 200 <= statusCode && statusCode < 300,
+    redirected: 300 <= statusCode && statusCode < 400,
+    size: data.length,
+    status: statusCode,
+    statusText: "some-text",
+    text: jest.fn(async () => data),
+    type: "basic",
+    url,
+    formData: jest.fn(async () => { throw new Error("formData() is not supported"); }),
+  };
+
+  return res;
+};
+
+describe("KubeApi", () => {
+  let request: KubeJsonApi;
+  let registerApiSpy: jest.SpiedFunction<ApiManager["registerApi"]>;
+  let fetchMock: AsyncFnMock<Fetch>;
+
+  beforeEach(async () => {
+    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    fetchMock = asyncFn();
+    di.override(fetchInjectable, () => fetchMock);
+
+    const createKubeJsonApi = di.inject(createKubeJsonApiInjectable);
+
+    request = createKubeJsonApi({
+      serverAddress: `http://127.0.0.1:9999`,
+      apiBase: "/api-kube",
+    });
+    registerApiSpy = jest.spyOn(di.inject(apiManagerInjectable), "registerApi");
+
+    di.inject(autoRegistrationInjectable);
+  });
+
+  describe("on first call to IngressApi.get()", () => {
+    let ingressApi: IngressApi;
+    let getCall: Promise<Ingress | null>;
+
+    beforeEach(async () => {
+      ingressApi = new IngressApi({
+        request,
+        objectConstructor: Ingress,
+        apiBase: "/apis/networking.k8s.io/v1/ingresses",
+        fallbackApiBases: ["/apis/extensions/v1beta1/ingresses"],
+        checkPreferredVersion: true,
+      });
+      getCall = ingressApi.get({
+        name: "foo",
+        namespace: "default",
+      });
+
+      // This is needed because of how JS promises work
+      await flushPromises();
+    });
+
+    it("requests version list from the api group from the initial apiBase", () => {
+      expect(fetchMock.mock.lastCall).toMatchObject([
+        "http://127.0.0.1:9999/api-kube/apis/networking.k8s.io",
+        {
+          headers: {
+            "content-type": "application/json",
+          },
+          method: "get",
+        },
+      ]);
+    });
+
+    describe("when the version list from the api group resolves", () => {
+      beforeEach(async () => {
+        await fetchMock.resolveSpecific(
+          ["http://127.0.0.1:9999/api-kube/apis/networking.k8s.io"],
+          createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/networking.k8s.io", JSON.stringify({
+            apiVersion: "v1",
+            kind: "APIGroup",
+            name: "networking.k8s.io",
+            versions: [
+              {
+                groupVersion: "networking.k8s.io/v1",
+                version: "v1",
+              },
+              {
+                groupVersion: "networking.k8s.io/v1beta1",
+                version: "v1beta1",
+              },
+            ],
+            preferredVersion: {
+              groupVersion: "networking.k8s.io/v1",
+              version: "v1",
+            },
+          })),
+        );
+      });
+
+      it("requests resources from the versioned api group from the initial apiBase", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "get",
+          },
+        ]);
+      });
+
+      describe("when resource request fufills with a resource", () => {
+        beforeEach(async () => {
+          await fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1", JSON.stringify({
+              resources: [{
+                name: "ingresses",
+              }],
+            })),
+          );
+        });
+
+        it("makes the request to get the resource", () => {
+          expect(fetchMock.mock.lastCall).toMatchObject([
+            "http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1/namespaces/default/ingresses/foo",
+            {
+              headers: {
+                "content-type": "application/json",
+              },
+              method: "get",
+            },
+          ]);
+        });
+
+        it("sets fields in the api instance", () => {
+          expect(ingressApi).toEqual(expect.objectContaining({
+            apiVersionPreferred: "v1",
+            apiPrefix: "/apis",
+            apiGroup: "networking.k8s.io",
+          }));
+        });
+
+        it("registers the api with the changes info", () => {
+          expect(registerApiSpy).toBeCalledWith(ingressApi);
+        });
+
+        describe("when the request resolves with no data", () => {
+          let result: Ingress | null;
+
+          beforeEach(async () => {
+            await fetchMock.resolveSpecific(
+              ["http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1/namespaces/default/ingresses/foo"],
+              createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1/namespaces/default/ingresses/foo", JSON.stringify({})),
+            );
+            result = await getCall;
+          });
+
+          it("results in the get call resolving to null", () => {
+            expect(result).toBeNull();
+          });
+
+          describe("on the second call to IngressApi.get()", () => {
+            let getCall: Promise<Ingress | null>;
+
+            beforeEach(async () => {
+              getCall = ingressApi.get({
+                name: "foo1",
+                namespace: "default",
+              });
+
+              // This is needed because of how JS promises work
+              await flushPromises();
+            });
+
+            it("makes the request to get the resource", () => {
+              expect(fetchMock.mock.lastCall).toMatchObject([
+                "http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1/namespaces/default/ingresses/foo1",
+                {
+                  headers: {
+                    "content-type": "application/json",
+                  },
+                  method: "get",
+                },
+              ]);
+            });
+
+            describe("when the request resolves with no data", () => {
+              let result: Ingress | null;
+
+              beforeEach(async () => {
+                await fetchMock.resolveSpecific(
+                  ["http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1/namespaces/default/ingresses/foo1"],
+                  createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1/namespaces/default/ingresses/foo1", JSON.stringify({})),
+                );
+                result = await getCall;
+              });
+
+              it("results in the get call resolving to null", () => {
+                expect(result).toBeNull();
+              });
+            });
+          });
+        });
+
+        describe("when the request resolves with data", () => {
+          let result: Ingress | null;
+
+          beforeEach(async () => {
+            await fetchMock.resolveSpecific(
+              ["http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1/namespaces/default/ingresses/foo"],
+              createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1/namespaces/default/ingresses/foo", JSON.stringify({
+                apiVersion: "v1",
+                kind: "Ingress",
+                metadata: {
+                  name: "foo",
+                  namespace: "default",
+                  resourceVersion: "1",
+                  uid: "12345",
+                },
+              })),
+            );
+            result = await getCall;
+          });
+
+          it("results in the get call resolving to an instance", () => {
+            expect(result).toBeInstanceOf(Ingress);
+          });
+
+          describe("on the second call to IngressApi.get()", () => {
+            let getCall: Promise<Ingress | null>;
+
+            beforeEach(async () => {
+              getCall = ingressApi.get({
+                name: "foo1",
+                namespace: "default",
+              });
+
+              // This is needed because of how JS promises work
+              await flushPromises();
+            });
+
+            it("makes the request to get the resource", () => {
+              expect(fetchMock.mock.lastCall).toMatchObject([
+                "http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1/namespaces/default/ingresses/foo1",
+                {
+                  headers: {
+                    "content-type": "application/json",
+                  },
+                  method: "get",
+                },
+              ]);
+            });
+
+            describe("when the request resolves with no data", () => {
+              let result: Ingress | null;
+
+              beforeEach(async () => {
+                await fetchMock.resolveSpecific(
+                  ["http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1/namespaces/default/ingresses/foo1"],
+                  createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1/namespaces/default/ingresses/foo1", JSON.stringify({})),
+                );
+                result = await getCall;
+              });
+
+              it("results in the get call resolving to null", () => {
+                expect(result).toBeNull();
+              });
+            });
+          });
+        });
+      });
+
+      describe("when resource request fufills with no resource", () => {
+        beforeEach(async () => {
+          await fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1", JSON.stringify({
+              resources: [],
+            })),
+          );
+        });
+
+        it("requests resources from the second versioned api group from the initial apiBase", () => {
+          expect(fetchMock.mock.lastCall).toMatchObject([
+            "http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1beta1",
+            {
+              headers: {
+                "content-type": "application/json",
+              },
+              method: "get",
+            },
+          ]);
+        });
+
+
+
+        describe("when resource request fufills with a resource", () => {
+          beforeEach(async () => {
+            await fetchMock.resolveSpecific(
+              ["http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1beta1"],
+              createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1beta1", JSON.stringify({
+                resources: [{
+                  name: "ingresses",
+                }],
+              })),
+            );
+          });
+
+          it("makes the request to get the resource", () => {
+            expect(fetchMock.mock.lastCall).toMatchObject([
+              "http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1beta1/namespaces/default/ingresses/foo",
+              {
+                headers: {
+                  "content-type": "application/json",
+                },
+                method: "get",
+              },
+            ]);
+          });
+
+          it("sets fields in the api instance", () => {
+            expect(ingressApi).toEqual(expect.objectContaining({
+              apiVersionPreferred: "v1beta1",
+              apiPrefix: "/apis",
+              apiGroup: "networking.k8s.io",
+            }));
+          });
+
+          it("registers the api with the changes info", () => {
+            expect(registerApiSpy).toBeCalledWith(ingressApi);
+          });
+
+          describe("when the request resolves with no data", () => {
+            let result: Ingress | null;
+
+            beforeEach(async () => {
+              await fetchMock.resolveSpecific(
+                ["http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1beta1/namespaces/default/ingresses/foo"],
+                createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1beta1/namespaces/default/ingresses/foo", JSON.stringify({})),
+              );
+              result = await getCall;
+            });
+
+            it("results in the get call resolving to null", () => {
+              expect(result).toBeNull();
+            });
+
+            describe("on the second call to IngressApi.get()", () => {
+              let getCall: Promise<Ingress | null>;
+
+              beforeEach(async () => {
+                getCall = ingressApi.get({
+                  name: "foo1",
+                  namespace: "default",
+                });
+
+                // This is needed because of how JS promises work
+                await flushPromises();
+              });
+
+              it("makes the request to get the resource", () => {
+                expect(fetchMock.mock.lastCall).toMatchObject([
+                  "http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1beta1/namespaces/default/ingresses/foo1",
+                  {
+                    headers: {
+                      "content-type": "application/json",
+                    },
+                    method: "get",
+                  },
+                ]);
+              });
+
+              describe("when the request resolves with no data", () => {
+                let result: Ingress | null;
+
+                beforeEach(async () => {
+                  await fetchMock.resolveSpecific(
+                    ["http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1beta1/namespaces/default/ingresses/foo1"],
+                    createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1beta1/namespaces/default/ingresses/foo1", JSON.stringify({})),
+                  );
+                  result = await getCall;
+                });
+
+                it("results in the get call resolving to null", () => {
+                  expect(result).toBeNull();
+                });
+              });
+            });
+          });
+
+          describe("when the request resolves with data", () => {
+            let result: Ingress | null;
+
+            beforeEach(async () => {
+              await fetchMock.resolveSpecific(
+                ["http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1beta1/namespaces/default/ingresses/foo"],
+                createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1beta1/namespaces/default/ingresses/foo", JSON.stringify({
+                  apiVersion: "v1",
+                  kind: "Ingress",
+                  metadata: {
+                    name: "foo",
+                    namespace: "default",
+                    resourceVersion: "1",
+                    uid: "12345",
+                  },
+                })),
+              );
+              result = await getCall;
+            });
+
+            it("results in the get call resolving to an instance", () => {
+              expect(result).toBeInstanceOf(Ingress);
+            });
+
+            describe("on the second call to IngressApi.get()", () => {
+              let getCall: Promise<Ingress | null>;
+
+              beforeEach(async () => {
+                getCall = ingressApi.get({
+                  name: "foo1",
+                  namespace: "default",
+                });
+
+                // This is needed because of how JS promises work
+                await flushPromises();
+              });
+
+              it("makes the request to get the resource", () => {
+                expect(fetchMock.mock.lastCall).toMatchObject([
+                  "http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1beta1/namespaces/default/ingresses/foo1",
+                  {
+                    headers: {
+                      "content-type": "application/json",
+                    },
+                    method: "get",
+                  },
+                ]);
+              });
+
+              describe("when the request resolves with no data", () => {
+                let result: Ingress | null;
+
+                beforeEach(async () => {
+                  await fetchMock.resolveSpecific(
+                    ["http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1beta1/namespaces/default/ingresses/foo1"],
+                    createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1beta1/namespaces/default/ingresses/foo1", JSON.stringify({})),
+                  );
+                  result = await getCall;
+                });
+
+                it("results in the get call resolving to null", () => {
+                  expect(result).toBeNull();
+                });
+              });
+            });
+          });
+        });
+      });
+    });
+
+    describe("when the version list from the api group resolves with no versions", () => {
+      beforeEach(async () => {
+        await fetchMock.resolveSpecific(
+          ["http://127.0.0.1:9999/api-kube/apis/networking.k8s.io"],
+          createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/networking.k8s.io", JSON.stringify({
+            "metadata": {},
+            "status": "Failure",
+            "message": "the server could not find the requested resource",
+            "reason": "NotFound",
+            "details": {
+              "causes": [
+                {
+                  "reason": "UnexpectedServerResponse",
+                  "message": "404 page not found",
+                },
+              ],
+            },
+            "code": 404,
+          }), 404),
+        );
+      });
+
+      it("requests the resources from the base api url from the fallback api", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/apis/extensions",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "get",
+          },
+        ]);
+      });
+
+      describe("when resource request fufills with a resource", () => {
+        beforeEach(async () => {
+          await fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/apis/extensions"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/extensions", JSON.stringify({
+              apiVersion: "v1",
+              kind: "APIGroup",
+              name: "extensions",
+              versions: [
+                {
+                  groupVersion: "extensions/v1beta1",
+                  version: "v1beta1",
+                },
+              ],
+              preferredVersion: {
+                groupVersion: "extensions/v1beta1",
+                version: "v1beta1",
+              },
+            })),
+          );
+        });
+
+        it("requests resource versions from the versioned api group from the fallback apiBase", () => {
+          expect(fetchMock.mock.lastCall).toMatchObject([
+            "http://127.0.0.1:9999/api-kube/apis/extensions/v1beta1",
+            {
+              headers: {
+                "content-type": "application/json",
+              },
+              method: "get",
+            },
+          ]);
+        });
+
+        describe("when the preferred version request resolves to v1beta1", () => {
+          beforeEach(async () => {
+            await fetchMock.resolveSpecific(
+              ["http://127.0.0.1:9999/api-kube/apis/extensions/v1beta1"],
+              createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/extensions", JSON.stringify({
+                resources: [{
+                  name: "ingresses",
+                }],
+              })),
+            );
+          });
+
+          it("makes the request to get the resource", () => {
+            expect(fetchMock.mock.lastCall).toMatchObject([
+              "http://127.0.0.1:9999/api-kube/apis/extensions/v1beta1/namespaces/default/ingresses/foo",
+              {
+                headers: {
+                  "content-type": "application/json",
+                },
+                method: "get",
+              },
+            ]);
+          });
+
+          it("sets fields in the api instance", () => {
+            expect(ingressApi).toEqual(expect.objectContaining({
+              apiVersionPreferred: "v1beta1",
+              apiPrefix: "/apis",
+              apiGroup: "extensions",
+            }));
+          });
+
+          it("registers the api with the changes info", () => {
+            expect(registerApiSpy).toBeCalledWith(ingressApi);
+          });
+
+          describe("when the request resolves with no data", () => {
+            let result: Ingress | null;
+
+            beforeEach(async () => {
+              await fetchMock.resolveSpecific(
+                ["http://127.0.0.1:9999/api-kube/apis/extensions/v1beta1/namespaces/default/ingresses/foo"],
+                createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/extensions/v1beta1/namespaces/default/ingresses/foo", JSON.stringify({})),
+              );
+              result = await getCall;
+            });
+
+            it("results in the get call resolving to null", () => {
+              expect(result).toBeNull();
+            });
+
+            describe("on the second call to IngressApi.get()", () => {
+              let getCall: Promise<Ingress | null>;
+
+              beforeEach(async () => {
+                getCall = ingressApi.get({
+                  name: "foo1",
+                  namespace: "default",
+                });
+
+                // This is needed because of how JS promises work
+                await flushPromises();
+              });
+
+              it("makes the request to get the resource", () => {
+                expect(fetchMock.mock.lastCall).toMatchObject([
+                  "http://127.0.0.1:9999/api-kube/apis/extensions/v1beta1/namespaces/default/ingresses/foo1",
+                  {
+                    headers: {
+                      "content-type": "application/json",
+                    },
+                    method: "get",
+                  },
+                ]);
+              });
+
+              describe("when the request resolves with no data", () => {
+                let result: Ingress | null;
+
+                beforeEach(async () => {
+                  await fetchMock.resolveSpecific(
+                    ["http://127.0.0.1:9999/api-kube/apis/extensions/v1beta1/namespaces/default/ingresses/foo1"],
+                    createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/extensions/v1beta1/namespaces/default/ingresses/foo1", JSON.stringify({})),
+                  );
+                  result = await getCall;
+                });
+
+                it("results in the get call resolving to null", () => {
+                  expect(result).toBeNull();
+                });
+              });
+            });
+          });
+
+          describe("when the request resolves with data", () => {
+            let result: Ingress | null;
+
+            beforeEach(async () => {
+              await fetchMock.resolveSpecific(
+                ["http://127.0.0.1:9999/api-kube/apis/extensions/v1beta1/namespaces/default/ingresses/foo"],
+                createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/extensions/v1beta1/namespaces/default/ingresses/foo", JSON.stringify({
+                  apiVersion: "v1beta1",
+                  kind: "Ingress",
+                  metadata: {
+                    name: "foo",
+                    namespace: "default",
+                    resourceVersion: "1",
+                    uid: "12345",
+                  },
+                })),
+              );
+              result = await getCall;
+            });
+
+            it("results in the get call resolving to an instance", () => {
+              expect(result).toBeInstanceOf(Ingress);
+            });
+
+            describe("on the second call to IngressApi.get()", () => {
+              let getCall: Promise<Ingress | null>;
+
+              beforeEach(async () => {
+                getCall = ingressApi.get({
+                  name: "foo1",
+                  namespace: "default",
+                });
+
+                // This is needed because of how JS promises work
+                await flushPromises();
+              });
+
+              it("makes the request to get the resource", () => {
+                expect(fetchMock.mock.lastCall).toMatchObject([
+                  "http://127.0.0.1:9999/api-kube/apis/extensions/v1beta1/namespaces/default/ingresses/foo1",
+                  {
+                    headers: {
+                      "content-type": "application/json",
+                    },
+                    method: "get",
+                  },
+                ]);
+              });
+
+              describe("when the request resolves with no data", () => {
+                let result: Ingress | null;
+
+                beforeEach(async () => {
+                  await fetchMock.resolveSpecific(
+                    ["http://127.0.0.1:9999/api-kube/apis/extensions/v1beta1/namespaces/default/ingresses/foo1"],
+                    createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/extensions/v1beta1/namespaces/default/ingresses/foo1", JSON.stringify({})),
+                  );
+                  result = await getCall;
+                });
+
+                it("results in the get call resolving to null", () => {
+                  expect(result).toBeNull();
+                });
+              });
+            });
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/src/common/k8s-api/__tests__/kube-api.test.ts b/src/common/k8s-api/__tests__/kube-api.test.ts
index 05da1f89d5..4f67ed1401 100644
--- a/src/common/k8s-api/__tests__/kube-api.test.ts
+++ b/src/common/k8s-api/__tests__/kube-api.test.ts
@@ -2,37 +2,97 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-
-import { forRemoteCluster, KubeApi } from "../kube-api";
-import { KubeJsonApi } from "../kube-json-api";
-import { KubeObject } from "../kube-object";
-import { delay } from "../../utils/delay";
+import type { KubeApiWatchCallback } from "../kube-api";
+import { KubeApi } from "../kube-api";
+import type { KubeJsonApi, KubeJsonApiData } from "../kube-json-api";
 import { PassThrough } from "stream";
-import { ApiManager } from "../api-manager";
-import type { FetchMock } from "jest-fetch-mock/types";
-import { DeploymentApi, Ingress, IngressApi, Pod, PodApi } from "../endpoints";
+import { Deployment, DeploymentApi, NamespaceApi, Pod, PodApi } from "../endpoints";
 import { getDiForUnitTesting } from "../../../renderer/getDiForUnitTesting";
-import apiManagerInjectable from "../api-manager/manager.injectable";
 import autoRegistrationInjectable from "../api-manager/auto-registration.injectable";
+import type { Fetch } from "../../fetch/fetch.injectable";
+import fetchInjectable from "../../fetch/fetch.injectable";
+import type { CreateKubeApiForRemoteCluster } from "../create-kube-api-for-remote-cluster.injectable";
+import createKubeApiForRemoteClusterInjectable from "../create-kube-api-for-remote-cluster.injectable";
+import type { AsyncFnMock } from "@async-fn/jest";
+import asyncFn from "@async-fn/jest";
+import { flushPromises } from "../../test-utils/flush-promises";
+import createKubeJsonApiInjectable from "../create-kube-json-api.injectable";
+import type { IKubeWatchEvent } from "../kube-watch-event";
+import type { KubeJsonApiDataFor } from "../kube-object";
+import type { Response, Headers as NodeFetchHeaders } from "node-fetch";
 import AbortController from "abort-controller";
 
-jest.mock("../api-manager");
+const createMockResponseFromString = (url: string, data: string, statusCode = 200) => {
+  const res: jest.Mocked<Response> = {
+    buffer: jest.fn(async () => { throw new Error("buffer() is not supported"); }),
+    clone: jest.fn(() => res),
+    arrayBuffer: jest.fn(async () => { throw new Error("arrayBuffer() is not supported"); }),
+    blob: jest.fn(async () => { throw new Error("blob() is not supported"); }),
+    body: new PassThrough(),
+    bodyUsed: false,
+    headers: new Headers() as NodeFetchHeaders,
+    json: jest.fn(async () => JSON.parse(await res.text())),
+    ok: 200 <= statusCode && statusCode < 300,
+    redirected: 300 <= statusCode && statusCode < 400,
+    size: data.length,
+    status: statusCode,
+    statusText: "some-text",
+    text: jest.fn(async () => data),
+    type: "basic",
+    url,
+    formData: jest.fn(async () => { throw new Error("formData() is not supported"); }),
+  };
 
-const mockFetch = fetch as FetchMock;
+  return res;
+};
 
-describe("forRemoteCluster", () => {
-  let apiManager: jest.Mocked<ApiManager>;
+const createMockResponseFromStream = (url: string, stream: NodeJS.ReadableStream, statusCode = 200) => {
+  const res: jest.Mocked<Response> = {
+    buffer: jest.fn(async () => { throw new Error("buffer() is not supported"); }),
+    clone: jest.fn(() => res),
+    arrayBuffer: jest.fn(async () => { throw new Error("arrayBuffer() is not supported"); }),
+    blob: jest.fn(async () => { throw new Error("blob() is not supported"); }),
+    body: stream,
+    bodyUsed: false,
+    headers: new Headers() as NodeFetchHeaders,
+    json: jest.fn(async () => JSON.parse(await res.text())),
+    ok: 200 <= statusCode && statusCode < 300,
+    redirected: 300 <= statusCode && statusCode < 400,
+    size: 10,
+    status: statusCode,
+    statusText: "some-text",
+    text: jest.fn(() => {
+      const chunks: Buffer[] = [];
 
-  beforeEach(() => {
+      return new Promise((resolve, reject) => {
+        stream.on("data", (chunk) => chunks.push(Buffer.from(chunk)));
+        stream.on("error", (err) => reject(err));
+        stream.on("end", () => resolve(Buffer.concat(chunks).toString("utf8")));
+      });
+    }),
+    type: "basic",
+    url,
+    formData: jest.fn(async () => { throw new Error("formData() is not supported"); }),
+  };
+
+  return res;
+};
+
+describe("createKubeApiForRemoteCluster", () => {
+  let createKubeApiForRemoteCluster: CreateKubeApiForRemoteCluster;
+  let fetchMock: AsyncFnMock<Fetch>;
+
+  beforeEach(async () => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    apiManager = new ApiManager() as jest.Mocked<ApiManager>;
+    fetchMock = asyncFn();
+    di.override(fetchInjectable, () => fetchMock);
 
-    di.override(apiManagerInjectable, () => apiManager);
+    createKubeApiForRemoteCluster = di.inject(createKubeApiForRemoteClusterInjectable);
   });
 
   it("builds api client for KubeObject", async () => {
-    const api = forRemoteCluster({
+    const api = createKubeApiForRemoteCluster({
       cluster: {
         server: "https://127.0.0.1:6443",
       },
@@ -44,232 +104,90 @@ describe("forRemoteCluster", () => {
     expect(api).toBeInstanceOf(KubeApi);
   });
 
-  it("builds api client for given KubeApi", async () => {
-    const api = forRemoteCluster({
-      cluster: {
-        server: "https://127.0.0.1:6443",
-      },
-      user: {
-        token: "daa",
-      },
-    }, Pod, PodApi);
+  describe("when building for remote cluster with specific constructor", () => {
+    let api: PodApi;
 
-    expect(api).toBeInstanceOf(PodApi);
-  });
-
-  it("calls right api endpoint", async () => {
-    const api = forRemoteCluster({
-      cluster: {
-        server: "https://127.0.0.1:6443",
-      },
-      user: {
-        token: "daa",
-      },
-    }, Pod);
-
-    mockFetch.mockResponse(async (request: any) => {
-      expect(request.url).toEqual("https://127.0.0.1:6443/api/v1/pods");
-
-      return {
-        body: "hello",
-      };
+    beforeEach(() => {
+      api = createKubeApiForRemoteCluster({
+        cluster: {
+          server: "https://127.0.0.1:6443",
+        },
+        user: {
+          token: "daa",
+        },
+      }, Pod, PodApi);
     });
 
-    expect.hasAssertions();
+    it("uses the constructor", () => {
+      expect(api).toBeInstanceOf(PodApi);
+    });
 
-    await api.list();
+    describe("when calling list without namespace", () => {
+      let listRequest: Promise<Pod[] | null>;
+
+      beforeEach(async () => {
+        listRequest = api.list();
+
+        // This is required because of how JS promises work
+        await flushPromises();
+      });
+
+      it("should request pods from default namespace", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "https://127.0.0.1:6443/api/v1/pods",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "get",
+          },
+        ]);
+      });
+
+      describe("when request resolves with data", () => {
+        beforeEach(async () => {
+          await fetchMock.resolveSpecific(
+            ["https://127.0.0.1:6443/api/v1/pods"],
+            createMockResponseFromString("https://127.0.0.1:6443/api/v1/pods", JSON.stringify({
+              kind: "PodList",
+              apiVersion: "v1",
+              metadata:{
+                resourceVersion: "452899",
+              },
+              items: [],
+            })),
+          );
+        });
+
+        it("resolves the list call", async () => {
+          expect(await listRequest).toEqual([]);
+        });
+      });
+    });
   });
 });
 
 describe("KubeApi", () => {
   let request: KubeJsonApi;
-  let apiManager: jest.Mocked<ApiManager>;
+  let fetchMock: AsyncFnMock<Fetch>;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    request = new KubeJsonApi({
+    fetchMock = asyncFn();
+    di.override(fetchInjectable, () => fetchMock);
+
+    const createKubeJsonApi = di.inject(createKubeJsonApiInjectable);
+
+    request = createKubeJsonApi({
       serverAddress: `http://127.0.0.1:9999`,
       apiBase: "/api-kube",
     });
-    apiManager = new ApiManager() as jest.Mocked<ApiManager>;
 
-    di.override(apiManagerInjectable, () => apiManager);
     di.inject(autoRegistrationInjectable);
   });
 
-  it("uses url from apiBase if apiBase contains the resource", async () => {
-    mockFetch.mockResponse(async (request: any) => {
-      if (request.url === "http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1") {
-        return {
-          body: JSON.stringify({
-            resources: [{
-              name: "ingresses",
-            }],
-          }),
-        };
-      } else if (request.url === "http://127.0.0.1:9999/api-kube/apis/extensions/v1beta1") {
-        // Even if the old API contains ingresses, KubeApi should prefer the apiBase url
-        return {
-          body: JSON.stringify({
-            resources: [{
-              name: "ingresses",
-            }],
-          }),
-        };
-      } else {
-        return {
-          body: JSON.stringify({
-            resources: [],
-          }),
-        };
-      }
-    });
-
-    const apiBase = "/apis/networking.k8s.io/v1/ingresses";
-    const fallbackApiBase = "/apis/extensions/v1beta1/ingresses";
-    const kubeApi = new IngressApi({
-      request,
-      objectConstructor: Ingress,
-      apiBase,
-      fallbackApiBases: [fallbackApiBase],
-      checkPreferredVersion: true,
-    });
-
-    await kubeApi.get({
-      name: "foo",
-      namespace: "default",
-    });
-    expect(kubeApi.apiPrefix).toEqual("/apis");
-    expect(kubeApi.apiGroup).toEqual("networking.k8s.io");
-  });
-
-  it("uses url from fallbackApiBases if apiBase lacks the resource", async () => {
-    mockFetch.mockResponse(async (request: any) => {
-      if (request.url === "http://127.0.0.1:9999/api-kube/apis/networking.k8s.io/v1") {
-        return {
-          body: JSON.stringify({
-            resources: [],
-          }),
-        };
-      } else if (request.url === "http://127.0.0.1:9999/api-kube/apis/extensions/v1beta1") {
-        return {
-          body: JSON.stringify({
-            resources: [{
-              name: "ingresses",
-            }],
-          }),
-        };
-      } else {
-        return {
-          body: JSON.stringify({
-            resources: [],
-          }),
-        };
-      }
-    });
-
-    const apiBase = "apis/networking.k8s.io/v1/ingresses";
-    const fallbackApiBase = "/apis/extensions/v1beta1/ingresses";
-    const kubeApi = new IngressApi({
-      request,
-      objectConstructor: Object.assign(KubeObject, { apiBase }),
-      kind: "Ingress",
-      fallbackApiBases: [fallbackApiBase],
-      checkPreferredVersion: true,
-    });
-
-    await kubeApi.get({
-      name: "foo",
-      namespace: "default",
-    });
-    expect(kubeApi.apiPrefix).toEqual("/apis");
-    expect(kubeApi.apiGroup).toEqual("extensions");
-  });
-
-  describe("checkPreferredVersion", () => {
-    it("registers with apiManager if checkPreferredVersion changes apiVersionPreferred", async () => {
-      expect.hasAssertions();
-
-      const api = new IngressApi({
-        objectConstructor: Ingress,
-        checkPreferredVersion: true,
-        fallbackApiBases: ["/apis/extensions/v1beta1/ingresses"],
-        request: {
-          get: jest.fn()
-            .mockImplementation((path: string) => {
-              switch (path) {
-                case "/apis/networking.k8s.io/v1":
-                  throw new Error("no");
-                case "/apis/extensions/v1beta1":
-                  return {
-                    resources: [
-                      {
-                        name: "ingresses",
-                      },
-                    ],
-                  };
-                case "/apis/extensions":
-                  return {
-                    preferredVersion: {
-                      version: "v1beta1",
-                    },
-                  };
-                default:
-                  throw new Error("unknown path");
-              }
-            }),
-        } as Partial<KubeJsonApi> as KubeJsonApi,
-      });
-
-      await (api as any).checkPreferredVersion();
-
-      expect(api.apiVersionPreferred).toBe("v1beta1");
-      expect(apiManager.registerApi).toBeCalledWith(api);
-    });
-
-    it("registers with apiManager if checkPreferredVersion changes apiVersionPreferred with non-grouped apis", async () => {
-      expect.hasAssertions();
-
-      const api = new PodApi({
-        objectConstructor: Pod,
-        checkPreferredVersion: true,
-        fallbackApiBases: ["/api/v1beta1/pods"],
-        request: {
-          get: jest.fn()
-            .mockImplementation((path: string) => {
-              switch (path) {
-                case "/api/v1":
-                  throw new Error("no");
-                case "/api/v1beta1":
-                  return {
-                    resources: [
-                      {
-                        name: "pods",
-                      },
-                    ],
-                  };
-                case "/api":
-                  return {
-                    preferredVersion: {
-                      version: "v1beta1",
-                    },
-                  };
-                default:
-                  throw new Error("unknown path");
-              }
-            }),
-        } as Partial<KubeJsonApi> as KubeJsonApi,
-      });
-
-      await (api as any).checkPreferredVersion();
-
-      expect(api.apiVersionPreferred).toBe("v1beta1");
-      expect(apiManager.registerApi).toBeCalledWith(api);
-    });
-  });
-
-  describe("patch", () => {
+  describe("patching deployments", () => {
     let api: DeploymentApi;
 
     beforeEach(() => {
@@ -278,140 +196,377 @@ describe("KubeApi", () => {
       });
     });
 
-    it("sends strategic patch by default", async () => {
-      expect.hasAssertions();
+    describe("when patching a resource without providing a strategy", () => {
+      let patchRequest: Promise<Deployment | null>;
 
-      mockFetch.mockResponse(async request => {
-        expect(request.method).toEqual("PATCH");
-        expect(request.headers.get("content-type")).toMatch("strategic-merge-patch");
-        expect(request.body?.toString()).toEqual(JSON.stringify({ spec: { replicas: 2 }}));
+      beforeEach(async () => {
+        patchRequest = api.patch({ name: "test", namespace: "default" }, {
+          spec: { replicas: 2 },
+        });
 
-        return {};
+        // This is needed because of how JS promises work
+        await flushPromises();
       });
 
-      await api.patch({ name: "test", namespace: "default" }, {
-        spec: { replicas: 2 },
+      it("requests a patch using strategic merge", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/apis/apps/v1/namespaces/default/deployments/test",
+          {
+            headers: {
+              "content-type": "application/strategic-merge-patch+json",
+            },
+            method: "patch",
+            body: JSON.stringify({ spec: { replicas: 2 }}),
+          },
+        ]);
+      });
+
+      describe("when the patch request resolves with data", () => {
+        beforeEach(async () => {
+          await fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/apis/apps/v1/namespaces/default/deployments/test"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/apps/v1/namespaces/default/deployments/test", JSON.stringify({
+              apiVersion: "v1",
+              kind: "Deployment",
+              metadata: {
+                name: "test",
+                namespace: "default",
+                resourceVersion: "1",
+                uid: "12345",
+              },
+              spec: {
+                replicas: 2,
+              },
+            })),
+          );
+        });
+
+        it("resolves the patch call", async () => {
+          expect(await patchRequest).toBeInstanceOf(Deployment);
+        });
       });
     });
 
-    it("allows to use merge patch", async () => {
-      expect.hasAssertions();
+    describe("when patching a resource using json patch", () => {
+      let patchRequest: Promise<Deployment | null>;
 
-      mockFetch.mockResponse(async request => {
-        expect(request.method).toEqual("PATCH");
-        expect(request.headers.get("content-type")).toMatch("merge-patch");
-        expect(request.body?.toString()).toEqual(JSON.stringify({ spec: { replicas: 2 }}));
+      beforeEach(async () => {
+        patchRequest = api.patch({ name: "test", namespace: "default" }, [
+          { op: "replace", path: "/spec/replicas", value: 2 },
+        ], "json");
 
-        return {};
+        // This is needed because of how JS promises work
+        await flushPromises();
       });
 
-      await api.patch({ name: "test", namespace: "default" }, {
-        spec: { replicas: 2 },
-      }, "merge");
+      it("requests a patch using json merge", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/apis/apps/v1/namespaces/default/deployments/test",
+          {
+            headers: {
+              "content-type": "application/json-patch+json",
+            },
+            method: "patch",
+            body: JSON.stringify([
+              { op: "replace", path: "/spec/replicas", value: 2 },
+            ]),
+          },
+        ]);
+      });
+
+      describe("when the patch request resolves with data", () => {
+        beforeEach(async () => {
+          await fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/apis/apps/v1/namespaces/default/deployments/test"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/apps/v1/namespaces/default/deployments/test", JSON.stringify({
+              apiVersion: "v1",
+              kind: "Deployment",
+              metadata: {
+                name: "test",
+                namespace: "default",
+                resourceVersion: "1",
+                uid: "12345",
+              },
+              spec: {
+                replicas: 2,
+              },
+            })),
+          );
+        });
+
+        it("resolves the patch call", async () => {
+          expect(await patchRequest).toBeInstanceOf(Deployment);
+        });
+      });
     });
 
-    it("allows to use json patch", async () => {
-      expect.hasAssertions();
+    describe("when patching a resource using merge patch", () => {
+      let patchRequest: Promise<Deployment | null>;
 
-      mockFetch.mockResponse(async request => {
-        expect(request.method).toEqual("PATCH");
-        expect(request.headers.get("content-type")).toMatch("json-patch");
-        expect(request.body?.toString()).toEqual(JSON.stringify([{ op: "replace", path: "/spec/replicas", value: 2 }]));
+      beforeEach(async () => {
+        patchRequest = api.patch(
+          { name: "test", namespace: "default" },
+          { metadata: { annotations: { provisioned: "True" }}},
+          "merge",
+        );
 
-        return {};
+        // This is needed because of how JS promises work
+        await flushPromises();
       });
 
-      await api.patch({ name: "test", namespace: "default" }, [
-        { op: "replace", path: "/spec/replicas", value: 2 },
-      ], "json");
-    });
-
-    it("allows deep partial patch", async () => {
-      expect.hasAssertions();
-
-      mockFetch.mockResponse(async request => {
-        expect(request.method).toEqual("PATCH");
-        expect(request.headers.get("content-type")).toMatch("merge-patch");
-        expect(request.body?.toString()).toEqual(JSON.stringify({ metadata: { annotations: { provisioned: "true" }}}));
-
-        return {};
+      it("requests a patch using json merge", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/apis/apps/v1/namespaces/default/deployments/test",
+          {
+            headers: {
+              "content-type": "application/merge-patch+json",
+            },
+            method: "patch",
+            body: JSON.stringify({ metadata: { annotations: { provisioned: "True" }}}),
+          },
+        ]);
       });
 
-      await api.patch(
-        { name: "test", namespace: "default" },
-        { metadata: { annotations: { provisioned: "true" }}},
-        "merge",
-      );
+      describe("when the patch request resolves with data", () => {
+        beforeEach(async () => {
+          await fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/apis/apps/v1/namespaces/default/deployments/test"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/apis/apps/v1/namespaces/default/deployments/test", JSON.stringify({
+              apiVersion: "v1",
+              kind: "Deployment",
+              metadata: {
+                name: "test",
+                namespace: "default",
+                resourceVersion: "1",
+                uid: "12345",
+                annotations: {
+                  provisioned: "True",
+                },
+              },
+            })),
+          );
+        });
+
+        it("resolves the patch call", async () => {
+          expect(await patchRequest).toBeInstanceOf(Deployment);
+        });
+      });
     });
   });
 
-  describe("delete", () => {
+  describe("deleting pods (namespace scoped resource)", () => {
     let api: PodApi;
 
     beforeEach(() => {
       api = new PodApi({
         request,
-        objectConstructor: Pod,
       });
     });
 
-    it("sends correct request with empty namespace", async () => {
-      expect.hasAssertions();
-      mockFetch.mockResponse(async request => {
-        expect(request.method).toEqual("DELETE");
-        expect(request.url).toEqual("http://127.0.0.1:9999/api-kube/api/v1/pods/foo?propagationPolicy=Background");
+    describe("when deleting by just name", () => {
+      let deleteRequest: Promise<KubeJsonApiData>;
 
-        return {};
+      beforeEach(async () => {
+        deleteRequest = api.delete({ name: "foo" });
+
+        // This is required for how JS promises work
+        await flushPromises();
       });
 
-      await api.delete({ name: "foo", namespace: "" });
+      it("requests deleting pod in default namespace", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods/foo?propagationPolicy=Background",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "delete",
+          },
+        ]);
+      });
+
+      describe("when request resolves", () => {
+        beforeEach(async () => {
+          fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods/foo?propagationPolicy=Background"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods/foo?propagationPolicy=Background", "{}"),
+          );
+        });
+
+        it("resolves the call", async () => {
+          expect(await deleteRequest).toBeDefined();
+        });
+      });
     });
 
-    it("sends correct request without namespace", async () => {
-      expect.hasAssertions();
-      mockFetch.mockResponse(async request => {
-        expect(request.method).toEqual("DELETE");
-        expect(request.url).toEqual("http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods/foo?propagationPolicy=Background");
+    describe("when deleting by name and empty namespace", () => {
+      let deleteRequest: Promise<KubeJsonApiData>;
 
-        return {};
+      beforeEach(async () => {
+        deleteRequest = api.delete({ name: "foo", namespace: "" });
+
+        // This is required for how JS promises work
+        await flushPromises();
       });
 
-      await api.delete({ name: "foo" });
+      it("requests deleting pod in default namespace", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods/foo?propagationPolicy=Background",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "delete",
+          },
+        ]);
+      });
+
+      describe("when request resolves", () => {
+        beforeEach(async () => {
+          fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods/foo?propagationPolicy=Background"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods/foo?propagationPolicy=Background", "{}"),
+          );
+        });
+
+        it("resolves the call", async () => {
+          expect(await deleteRequest).toBeDefined();
+        });
+      });
     });
 
-    it("sends correct request with namespace", async () => {
-      expect.hasAssertions();
-      mockFetch.mockResponse(async request => {
-        expect(request.method).toEqual("DELETE");
-        expect(request.url).toEqual("http://127.0.0.1:9999/api-kube/api/v1/namespaces/kube-system/pods/foo?propagationPolicy=Background");
+    describe("when deleting by name and namespace", () => {
+      let deleteRequest: Promise<KubeJsonApiData>;
 
-        return {};
+      beforeEach(async () => {
+        deleteRequest = api.delete({ name: "foo", namespace: "test" });
+
+        // This is required for how JS promises work
+        await flushPromises();
       });
 
-      await api.delete({ name: "foo", namespace: "kube-system" });
-    });
-
-    it("allows to change propagationPolicy", async () => {
-      expect.hasAssertions();
-      mockFetch.mockResponse(async request => {
-        expect(request.method).toEqual("DELETE");
-        expect(request.url).toMatch("propagationPolicy=Orphan");
-
-        return {};
+      it("requests deleting pod in given namespace", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/api/v1/namespaces/test/pods/foo?propagationPolicy=Background",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "delete",
+          },
+        ]);
       });
 
-      await api.delete({ name: "foo", namespace: "default", propagationPolicy: "Orphan" });
+      describe("when request resolves", () => {
+        beforeEach(async () => {
+          fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/api/v1/namespaces/test/pods/foo?propagationPolicy=Background"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/api/v1/namespaces/test/pods/foo?propagationPolicy=Background", "{}"),
+          );
+        });
+
+        it("resolves the call", async () => {
+          expect(await deleteRequest).toBeDefined();
+        });
+      });
     });
   });
 
-  describe("watch", () => {
+  describe("deleting namespaces (cluser scoped resource)", () => {
+    let api: NamespaceApi;
+
+    beforeEach(() => {
+      api = new NamespaceApi({
+        request,
+      });
+    });
+
+    describe("when deleting by just name", () => {
+      let deleteRequest: Promise<KubeJsonApiData>;
+
+      beforeEach(async () => {
+        deleteRequest = api.delete({ name: "foo" });
+
+        // This is required for how JS promises work
+        await flushPromises();
+      });
+
+      it("requests deleting Namespace without namespace", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/api/v1/namespaces/foo?propagationPolicy=Background",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "delete",
+          },
+        ]);
+      });
+
+      describe("when request resolves", () => {
+        beforeEach(async () => {
+          fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/api/v1/namespaces/foo?propagationPolicy=Background"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/api/v1/namespaces/foo?propagationPolicy=Background", "{}"),
+          );
+        });
+
+        it("resolves the call", async () => {
+          expect(await deleteRequest).toBeDefined();
+        });
+      });
+    });
+
+    describe("when deleting by name and empty namespace", () => {
+      let deleteRequest: Promise<KubeJsonApiData>;
+
+      beforeEach(async () => {
+        deleteRequest = api.delete({ name: "foo", namespace: "" });
+
+        // This is required for how JS promises work
+        await flushPromises();
+      });
+
+      it("requests deleting Namespace without namespace", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/api/v1/namespaces/foo?propagationPolicy=Background",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "delete",
+          },
+        ]);
+      });
+
+      describe("when request resolves", () => {
+        beforeEach(async () => {
+          fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/api/v1/namespaces/foo?propagationPolicy=Background"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/api/v1/namespaces/foo?propagationPolicy=Background", "{}"),
+          );
+        });
+
+        it("resolves the call", async () => {
+          expect(await deleteRequest).toBeDefined();
+        });
+      });
+    });
+
+    describe("when deleting by name and namespace", () => {
+      it("rejects request", () => {
+        expect(api.delete({ name: "foo", namespace: "test" })).rejects.toBeDefined();
+      });
+    });
+  });
+
+  describe("watching pods", () => {
     let api: PodApi;
     let stream: PassThrough;
 
     beforeEach(() => {
       api = new PodApi({
         request,
-        objectConstructor: Pod,
       });
       stream = new PassThrough();
     });
@@ -421,184 +576,341 @@ describe("KubeApi", () => {
       stream.destroy();
     });
 
-    it("sends a valid watch request", () => {
-      const spy = jest.spyOn(request, "getResponse");
+    describe("when watching in a namespace", () => {
+      let stopWatch: () => void;
+      let callback: jest.MockedFunction<KubeApiWatchCallback>;
 
-      mockFetch.mockResponse(async () => {
-        return {
-          // needed for https://github.com/jefflau/jest-fetch-mock/issues/218
-          body: stream as unknown as string,
-        };
+      beforeEach(async () => {
+        callback = jest.fn();
+        stopWatch = api.watch({
+          namespace: "kube-system",
+          callback,
+        });
+
+        await flushPromises();
       });
 
-      api.watch({ namespace: "kube-system" });
-      expect(spy).toHaveBeenCalledWith("/api/v1/namespaces/kube-system/pods?watch=1&resourceVersion=", expect.anything(), expect.anything());
+      it("requests the watch", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/api/v1/namespaces/kube-system/pods?watch=1&resourceVersion=&timeoutSeconds=600",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "get",
+          },
+        ]);
+      });
+
+      describe("when the request resolves with a stream", () => {
+        beforeEach(async () => {
+          await fetchMock.resolveSpecific(
+            ([url, init]) => {
+              const isMatch = url === "http://127.0.0.1:9999/api-kube/api/v1/namespaces/kube-system/pods?watch=1&resourceVersion=&timeoutSeconds=600";
+
+              if (isMatch) {
+                init?.signal?.addEventListener("abort", () => {
+                  stream.destroy();
+                });
+              }
+
+              return isMatch;
+            },
+            createMockResponseFromStream("http://127.0.0.1:9999/api-kube/api/v1/namespaces/kube-system/pods?watch=1&resourceVersion=&timeoutSeconds=600", stream),
+          );
+        });
+
+        describe("when some data comes back on the stream", () => {
+          beforeEach(() => {
+            stream.emit("data", `${JSON.stringify({
+              type: "ADDED",
+              object: {
+                apiVersion: "v1",
+                kind: "Pod",
+                metadata: {
+                  name: "foobar",
+                  namespace: "kube-system",
+                  resourceVersion: "1",
+                  uid: "123456",
+                },
+              },
+            } as IKubeWatchEvent<KubeJsonApiDataFor<Pod>>)}\n`);
+          });
+
+          it("calls the callback with the data", () => {
+            expect(callback).toBeCalledWith(
+              {
+                type: "ADDED",
+                object: {
+                  apiVersion: "v1",
+                  kind: "Pod",
+                  metadata: {
+                    name: "foobar",
+                    namespace: "kube-system",
+                    resourceVersion: "1",
+                    selfLink: "/api/v1/namespaces/kube-system/pods/foobar",
+                    uid: "123456",
+                  },
+                },
+              },
+              null,
+            );
+          });
+
+          describe("when stopping the watch", () => {
+            beforeEach(() => {
+              stopWatch();
+            });
+
+            it("closes the stream", () => {
+              expect(stream.destroyed).toBe(true);
+            });
+          });
+        });
+      });
     });
 
-    it("sends timeout as a query parameter", async () => {
-      const spy = jest.spyOn(request, "getResponse");
+    describe("when watching in a namespace with an abort controller provided", () => {
+      let callback: jest.MockedFunction<KubeApiWatchCallback>;
+      let abortController: AbortController;
 
-      mockFetch.mockResponse(async () => {
-        return {
-          // needed for https://github.com/jefflau/jest-fetch-mock/issues/218
-          body: stream as unknown as string,
-        };
+      beforeEach(async () => {
+        callback = jest.fn();
+        abortController = new AbortController();
+        api.watch({
+          namespace: "kube-system",
+          callback,
+          abortController,
+        });
+
+        await flushPromises();
       });
 
-      api.watch({ namespace: "kube-system", timeout: 60 });
-      expect(spy).toHaveBeenCalledWith("/api/v1/namespaces/kube-system/pods?watch=1&resourceVersion=", { query: { timeoutSeconds: 60 }}, expect.anything());
+      it("requests the watch", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/api/v1/namespaces/kube-system/pods?watch=1&resourceVersion=&timeoutSeconds=600",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "get",
+          },
+        ]);
+      });
+
+      describe("when the request resolves with a stream", () => {
+        beforeEach(async () => {
+          await fetchMock.resolveSpecific(
+            ([url, init]) => {
+              const isMatch = url === "http://127.0.0.1:9999/api-kube/api/v1/namespaces/kube-system/pods?watch=1&resourceVersion=&timeoutSeconds=600";
+
+              if (isMatch) {
+                init?.signal?.addEventListener("abort", () => {
+                  stream.destroy();
+                });
+              }
+
+              return isMatch;
+            },
+            createMockResponseFromStream("http://127.0.0.1:9999/api-kube/api/v1/namespaces/kube-system/pods?watch=1&resourceVersion=&timeoutSeconds=600", stream),
+          );
+        });
+
+        describe("when some data comes back on the stream", () => {
+          beforeEach(() => {
+            stream.emit("data", `${JSON.stringify({
+              type: "ADDED",
+              object: {
+                apiVersion: "v1",
+                kind: "Pod",
+                metadata: {
+                  name: "foobar",
+                  namespace: "kube-system",
+                  resourceVersion: "1",
+                  uid: "123456",
+                },
+              },
+            } as IKubeWatchEvent<KubeJsonApiDataFor<Pod>>)}\n`);
+          });
+
+          it("calls the callback with the data", () => {
+            expect(callback).toBeCalledWith(
+              {
+                type: "ADDED",
+                object: {
+                  apiVersion: "v1",
+                  kind: "Pod",
+                  metadata: {
+                    name: "foobar",
+                    namespace: "kube-system",
+                    resourceVersion: "1",
+                    selfLink: "/api/v1/namespaces/kube-system/pods/foobar",
+                    uid: "123456",
+                  },
+                },
+              },
+              null,
+            );
+          });
+
+          describe("when stopping the watch via the controller", () => {
+            beforeEach(() => {
+              abortController.abort();
+            });
+
+            it("closes the stream", () => {
+              expect(stream.destroyed).toBe(true);
+            });
+          });
+        });
+      });
     });
 
-    it("aborts watch using abortController", (done) => {
-      const spy = jest.spyOn(request, "getResponse");
+    describe("when watching in a namespace with a timeout", () => {
+      let stopWatch: () => void;
+      let callback: jest.MockedFunction<KubeApiWatchCallback>;
 
-      mockFetch.mockResponse(async request => {
-        request.signal.addEventListener("abort", () => {
-          done();
-        });
-
-        return {
-          // needed for https://github.com/jefflau/jest-fetch-mock/issues/218
-          body: stream as unknown as string,
-        };
-      });
-
-      const abortController = new AbortController();
-
-      api.watch({
-        namespace: "kube-system",
-        timeout: 60,
-        abortController,
-      });
-
-      expect(spy).toHaveBeenCalledWith("/api/v1/namespaces/kube-system/pods?watch=1&resourceVersion=", { query: { timeoutSeconds: 60 }}, expect.anything());
-      delay(100).then(() => abortController.abort());
-    });
-
-    describe("retries", () => {
-      it("if request ended", (done) => {
-        const spy = jest.spyOn(request, "getResponse");
-
-        jest.spyOn(stream, "on").mockImplementation((event: string | symbol, callback: Function) => {
-          // End the request in 100ms.
-          if (event === "end") {
-            setTimeout(() => {
-              callback();
-            }, 100);
-          }
-
-          return stream;
-        });
-
-        // we need to mock using jest as jest-fetch-mock doesn't support mocking the body completely
-        jest.spyOn(global, "fetch").mockImplementation(async () => {
-          return {
-            ok: true,
-            body: stream as never,
-          } as Partial<Response> as Response;
-        });
-
-        api.watch({
+      beforeEach(async () => {
+        callback = jest.fn();
+        stopWatch = api.watch({
           namespace: "kube-system",
+          callback,
+          timeout: 60,
         });
 
-        expect(spy).toHaveBeenCalledTimes(1);
-
-        setTimeout(() => {
-          expect(spy).toHaveBeenCalledTimes(2);
-          done();
-        }, 2000);
+        await flushPromises();
       });
 
-      it("if request not closed after timeout", (done) => {
-        const spy = jest.spyOn(request, "getResponse");
-
-        mockFetch.mockResponse(async () => {
-          return {
-            // needed for https://github.com/jefflau/jest-fetch-mock/issues/218
-            body: stream as unknown as string,
-          };
-        });
-
-        const timeoutSeconds = 1;
-
-        api.watch({
-          namespace: "kube-system",
-          timeout: timeoutSeconds,
-        });
-
-        expect(spy).toHaveBeenCalledTimes(1);
-
-        setTimeout(() => {
-          expect(spy).toHaveBeenCalledTimes(2);
-          done();
-        }, timeoutSeconds * 1000 * 1.2);
+      it("requests the watch", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/api/v1/namespaces/kube-system/pods?watch=1&resourceVersion=&timeoutSeconds=60",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "get",
+          },
+        ]);
       });
 
-      it("retries only once if request ends and timeout is set", (done) => {
-        const spy = jest.spyOn(request, "getResponse");
+      describe("when the request resolves with a stream", () => {
+        beforeEach(async () => {
+          await fetchMock.resolveSpecific(
+            ([url, init]) => {
+              const isMatch = url === "http://127.0.0.1:9999/api-kube/api/v1/namespaces/kube-system/pods?watch=1&resourceVersion=&timeoutSeconds=60";
 
-        jest.spyOn(stream, "on").mockImplementation((event: string | symbol, callback: Function) => {
-          // End the request in 100ms.
-          if (event === "end") {
-            setTimeout(() => {
-              callback();
-            }, 100);
-          }
+              if (isMatch) {
+                init?.signal?.addEventListener("abort", () => {
+                  stream.destroy();
+                });
+              }
 
-          return stream;
+              return isMatch;
+            },
+            createMockResponseFromStream("http://127.0.0.1:9999/api-kube/api/v1/namespaces/kube-system/pods?watch=1&resourceVersion=&timeoutSeconds=60", stream),
+          );
         });
 
-        // we need to mock using jest as jest-fetch-mock doesn't support mocking the body completely
-        jest.spyOn(global, "fetch").mockImplementation(async () => {
-          return {
-            ok: true,
-            body: stream as never,
-          } as Partial<Response> as Response;
+        describe("when some data comes back on the stream", () => {
+          beforeEach(() => {
+            stream.emit("data", `${JSON.stringify({
+              type: "ADDED",
+              object: {
+                apiVersion: "v1",
+                kind: "Pod",
+                metadata: {
+                  name: "foobar",
+                  namespace: "kube-system",
+                  resourceVersion: "1",
+                  uid: "123456",
+                },
+              },
+            } as IKubeWatchEvent<KubeJsonApiDataFor<Pod>>)}\n`);
+          });
+
+          it("calls the callback with the data", () => {
+            expect(callback).toBeCalledWith(
+              {
+                type: "ADDED",
+                object: {
+                  apiVersion: "v1",
+                  kind: "Pod",
+                  metadata: {
+                    name: "foobar",
+                    namespace: "kube-system",
+                    resourceVersion: "1",
+                    selfLink: "/api/v1/namespaces/kube-system/pods/foobar",
+                    uid: "123456",
+                  },
+                },
+              },
+              null,
+            );
+          });
+
+          describe("when stopping the watch", () => {
+            beforeEach(() => {
+              stopWatch();
+            });
+
+            it("closes the stream", () => {
+              expect(stream.destroyed).toBe(true);
+            });
+          });
+
+          describe("when the watch ends", () => {
+            beforeEach(() => {
+              stream.end();
+            });
+
+            it("requests a new watch", () => {
+              expect(fetchMock.mock.lastCall).toMatchObject([
+                "http://127.0.0.1:9999/api-kube/api/v1/namespaces/kube-system/pods?watch=1&resourceVersion=&timeoutSeconds=60",
+                {
+                  headers: {
+                    "content-type": "application/json",
+                  },
+                  method: "get",
+                },
+              ]);
+            });
+
+            describe("when stopping the watch", () => {
+              beforeEach(() => {
+                stopWatch();
+              });
+
+              it("closes the stream", () => {
+                expect(stream.destroyed).toBe(true);
+              });
+            });
+          });
         });
-
-        const timeoutSeconds = 0.5;
-
-        api.watch({
-          namespace: "kube-system",
-          timeout: timeoutSeconds,
-        });
-
-        expect(spy).toHaveBeenCalledTimes(1);
-
-        setTimeout(() => {
-          expect(spy).toHaveBeenCalledTimes(2);
-          done();
-        }, 2000);
-      });
-
-      afterEach(() => {
-        jest.clearAllMocks();
       });
     });
   });
 
-  describe("create", () => {
+  describe("creating pods", () => {
     let api: PodApi;
 
     beforeEach(() => {
       api = new PodApi({
         request,
-        objectConstructor: Pod,
       });
     });
 
-    it("should add kind and apiVersion", async () => {
-      expect.hasAssertions();
+    describe("when creating a pod", () => {
+      let createRequest: Promise<Pod | null>;
 
-      mockFetch.mockResponse(async request => {
-        expect(request.method).toEqual("POST");
-        expect(JSON.parse(String(request.body))).toEqual({
-          kind: "Pod",
-          apiVersion: "v1",
+      beforeEach(async () => {
+        createRequest = api.create({
+          name: "foobar",
+          namespace: "default",
+        }, {
           metadata: {
-            name: "foobar",
-            namespace: "default",
+            labels: {
+              foo: "bar",
+            },
           },
           spec: {
             containers: [
@@ -617,101 +929,324 @@ describe("KubeApi", () => {
           },
         });
 
-        return {};
+        // This is required because of how JS promises work
+        await flushPromises();
       });
 
-      await api.create({
-        name: "foobar",
-        namespace: "default",
-      }, {
-        spec: {
-          containers: [
-            {
-              name: "web",
-              image: "nginx",
-              ports: [
-                {
-                  name: "web",
-                  containerPort: 80,
-                  protocol: "TCP",
+      it("should request to create a pod with full descriptor", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "post",
+            body: JSON.stringify({
+              metadata: {
+                labels: {
+                  foo: "bar",
                 },
-              ],
-            },
-          ],
-        },
-      });
-    });
-
-    it("doesn't override metadata.labels", async () => {
-      expect.hasAssertions();
-
-      mockFetch.mockResponse(async request => {
-        expect(request.method).toEqual("POST");
-        expect(JSON.parse(String(request.body))).toEqual({
-          kind: "Pod",
-          apiVersion: "v1",
-          metadata: {
-            name: "foobar",
-            namespace: "default",
-            labels: {
-              foo: "bar",
-            },
+                name: "foobar",
+                namespace: "default",
+              },
+              spec: {
+                containers: [{
+                  name: "web",
+                  image: "nginx",
+                  ports: [{
+                    name: "web",
+                    containerPort: 80,
+                    protocol: "TCP",
+                  }],
+                }],
+              },
+              kind: "Pod",
+              apiVersion: "v1",
+            }),
           },
+        ]);
+      });
+
+      describe("when request resolves with data", () => {
+        beforeEach(async () =>  {
+          await fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods", JSON.stringify({
+              kind: "Pod",
+              apiVersion: "v1",
+              metadata: {
+                name: "foobar",
+                namespace: "default",
+                labels: {
+                  foo: "bar",
+                },
+                resourceVersion: "1",
+                uid: "123456798",
+              },
+              spec: {
+                containers: [{
+                  name: "web",
+                  image: "nginx",
+                  ports: [{
+                    name: "web",
+                    containerPort: 80,
+                    protocol: "TCP",
+                  }],
+                }],
+              },
+            })),
+          );
         });
 
-        return {};
-      });
-
-      await api.create({
-        name: "foobar",
-        namespace: "default",
-      }, {
-        metadata: {
-          labels: {
-            foo: "bar",
-          },
-        },
+        it("call should resolve in a Pod instance", async () => {
+          expect(await createRequest).toBeInstanceOf(Pod);
+        });
       });
     });
   });
 
-  describe("update", () => {
+  describe("updating pods", () => {
     let api: PodApi;
 
     beforeEach(() => {
       api = new PodApi({
         request,
-        objectConstructor: Pod,
       });
     });
 
-    it("doesn't override metadata.labels", async () => {
-      expect.hasAssertions();
+    describe("when updating a pod", () => {
+      let updateRequest: Promise<Pod | null>;
 
-      mockFetch.mockResponse(async request => {
-        expect(request.method).toEqual("PUT");
-        expect(JSON.parse(String(request.body))).toEqual({
+      beforeEach(async () => {
+        updateRequest = api.update({
+          name: "foobar",
+          namespace: "default",
+        }, {
+          kind: "Pod",
+          apiVersion: "v1",
           metadata: {
-            name: "foobar",
-            namespace: "default",
             labels: {
               foo: "bar",
             },
           },
+          spec: {
+            containers: [{
+              name: "web",
+              image: "nginx",
+              ports: [{
+                name: "web",
+                containerPort: 80,
+                protocol: "TCP",
+              }],
+            }],
+          },
         });
 
-        return {};
+        await flushPromises();
       });
 
-      await api.update({
-        name: "foobar",
-        namespace: "default",
-      }, {
-        metadata: {
-          labels: {
-            foo: "bar",
+      it("should request that the pod is updated", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods/foobar",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "put",
+            body: JSON.stringify({
+              kind: "Pod",
+              apiVersion: "v1",
+              metadata: {
+                labels: {
+                  foo: "bar",
+                },
+                name: "foobar",
+                namespace: "default",
+              },
+              spec: {
+                containers: [{
+                  name: "web",
+                  image: "nginx",
+                  ports: [{
+                    name: "web",
+                    containerPort: 80,
+                    protocol: "TCP",
+                  }],
+                }],
+              },
+            }),
           },
-        },
+        ]);
+      });
+
+      describe("when the request resolves with data", () => {
+        beforeEach(async () => {
+          await fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods/foobar"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods/foobar", JSON.stringify({
+              kind: "Pod",
+              apiVersion: "v1",
+              metadata: {
+                name: "foobar",
+                namespace: "default",
+                labels: {
+                  foo: "bar",
+                },
+                resourceVersion: "1",
+                uid: "123456798",
+              },
+              spec: {
+                containers: [{
+                  name: "web",
+                  image: "nginx",
+                  ports: [{
+                    name: "web",
+                    containerPort: 80,
+                    protocol: "TCP",
+                  }],
+                }],
+              },
+            })),
+          );
+        });
+
+        it("the call should resolve to a Pod", async () => {
+          expect(await updateRequest).toBeInstanceOf(Pod);
+        });
+      });
+    });
+  });
+
+  describe("listing pods", () => {
+    let api: PodApi;
+
+    beforeEach(() => {
+      api = new PodApi({
+        request,
+      });
+    });
+
+    describe("when listing pods with no descriptor", () => {
+      let listRequest: Promise<Pod[] | null>;
+
+      beforeEach(async () => {
+        listRequest = api.list();
+
+        await flushPromises();
+      });
+
+      it("should request that the pods from all namespaces", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/api/v1/pods",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "get",
+          },
+        ]);
+      });
+
+      describe("when the request resolves with empty data", () => {
+        beforeEach(async () => {
+          await fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/api/v1/pods"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/api/v1/pods", JSON.stringify({
+              kind: "PodList",
+              apiVersion: "v1",
+              metadata: {},
+              items: [],
+            })),
+          );
+        });
+
+        it("the call should resolve to an empty list", async () => {
+          expect(await listRequest).toEqual([]);
+        });
+      });
+    });
+
+    describe("when listing pods with descriptor with namespace=''", () => {
+      let listRequest: Promise<Pod[] | null>;
+
+      beforeEach(async () => {
+        listRequest = api.list({
+          namespace: "",
+        });
+
+        await flushPromises();
+      });
+
+      it("should request that the pods from all namespaces", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/api/v1/pods",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "get",
+          },
+        ]);
+      });
+
+      describe("when the request resolves with empty data", () => {
+        beforeEach(async () => {
+          await fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/api/v1/pods"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/api/v1/pods", JSON.stringify({
+              kind: "PodList",
+              apiVersion: "v1",
+              metadata: {},
+              items: [],
+            })),
+          );
+        });
+
+        it("the call should resolve to an empty list", async () => {
+          expect(await listRequest).toEqual([]);
+        });
+      });
+    });
+
+    describe("when listing pods with descriptor with namespace='default'", () => {
+      let listRequest: Promise<Pod[] | null>;
+
+      beforeEach(async () => {
+        listRequest = api.list({
+          namespace: "default",
+        });
+
+        await flushPromises();
+      });
+
+      it("should request that the pods from just the default namespace", () => {
+        expect(fetchMock.mock.lastCall).toMatchObject([
+          "http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods",
+          {
+            headers: {
+              "content-type": "application/json",
+            },
+            method: "get",
+          },
+        ]);
+      });
+
+      describe("when the request resolves with empty data", () => {
+        beforeEach(async () => {
+          await fetchMock.resolveSpecific(
+            ["http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods"],
+            createMockResponseFromString("http://127.0.0.1:9999/api-kube/api/v1/namespaces/default/pods", JSON.stringify({
+              kind: "PodList",
+              apiVersion: "v1",
+              metadata: {},
+              items: [],
+            })),
+          );
+        });
+
+        it("the call should resolve to an empty list", async () => {
+          expect(await listRequest).toEqual([]);
+        });
       });
     });
   });
diff --git a/src/common/k8s-api/api-base.ts b/src/common/k8s-api/api-base.ts
index e511dd8454..9544e4f60c 100644
--- a/src/common/k8s-api/api-base.ts
+++ b/src/common/k8s-api/api-base.ts
@@ -3,38 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { JsonApi } from "./json-api";
-import { apiPrefix, isDebugging, isDevelopment } from "../vars";
-import { appEventBus } from "../app-event-bus/event-bus";
+import type { JsonApi } from "./json-api";
+import { getInjectionToken } from "@ogre-tools/injectable";
 
-export let apiBase: JsonApi;
-
-if (typeof window === "undefined") {
-  appEventBus.addListener((event) => {
-    if (event.name !== "lens-proxy" && event.action !== "listen") return;
-
-    const params = event.params as { port?: number };
-
-    if (!params.port) return;
-
-    apiBase = new JsonApi({
-      serverAddress: `http://127.0.0.1:${params.port}`,
-      apiBase: apiPrefix,
-      debug: isDevelopment || isDebugging,
-    }, {
-      headers: {
-        "Host": `localhost:${params.port}`,
-      },
-    });
-  });
-} else {
-  apiBase = new JsonApi({
-    serverAddress: `http://127.0.0.1:${window.location.port}`,
-    apiBase: apiPrefix,
-    debug: isDevelopment || isDebugging,
-  }, {
-    headers: {
-      "Host": window.location.host,
-    },
-  });
-}
+export const apiBaseInjectionToken = getInjectionToken<JsonApi>({
+  id: "api-base-token",
+});
diff --git a/src/common/k8s-api/api-kube.ts b/src/common/k8s-api/api-kube.ts
index 4154ec2f00..58aa95208a 100644
--- a/src/common/k8s-api/api-kube.ts
+++ b/src/common/k8s-api/api-kube.ts
@@ -4,11 +4,8 @@
  */
 
 import { getInjectionToken } from "@ogre-tools/injectable";
-import { asLegacyGlobalForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
 import type { KubeJsonApi } from "./kube-json-api";
 
 export const apiKubeInjectionToken = getInjectionToken<KubeJsonApi>({
   id: "api-kube-injection-token",
 });
-
-export const apiKube = asLegacyGlobalForExtensionApi(apiKubeInjectionToken);
diff --git a/src/common/k8s-api/create-json-api.injectable.ts b/src/common/k8s-api/create-json-api.injectable.ts
new file mode 100644
index 0000000000..aa05a5c157
--- /dev/null
+++ b/src/common/k8s-api/create-json-api.injectable.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { RequestInit } from "node-fetch";
+import fetchInjectable from "../fetch/fetch.injectable";
+import loggerInjectable from "../logger.injectable";
+import type { JsonApiConfig, JsonApiData, JsonApiDependencies, JsonApiParams } from "./json-api";
+import { JsonApi } from "./json-api";
+
+export type CreateJsonApi = <Data = JsonApiData, Params extends JsonApiParams<Data> = JsonApiParams<Data>>(config: JsonApiConfig, reqInit?: RequestInit) => JsonApi<Data, Params>;
+
+const createJsonApiInjectable = getInjectable({
+  id: "create-json-api",
+  instantiate: (di): CreateJsonApi => {
+    const deps: JsonApiDependencies = {
+      fetch: di.inject(fetchInjectable),
+      logger: di.inject(loggerInjectable),
+    };
+
+    return (config, reqInit) => new JsonApi(deps, config, reqInit);
+  },
+});
+
+export default createJsonApiInjectable;
diff --git a/src/common/k8s-api/create-kube-api-for-cluster.injectable.ts b/src/common/k8s-api/create-kube-api-for-cluster.injectable.ts
new file mode 100644
index 0000000000..e7509dcbc7
--- /dev/null
+++ b/src/common/k8s-api/create-kube-api-for-cluster.injectable.ts
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { apiKubePrefix } from "../vars";
+import isDevelopmentInjectable from "../vars/is-development.injectable";
+import { apiBaseInjectionToken } from "./api-base";
+import createKubeJsonApiInjectable from "./create-kube-json-api.injectable";
+import type { KubeApiOptions } from "./kube-api";
+import { KubeApi } from "./kube-api";
+import type { KubeJsonApiDataFor, KubeObject, KubeObjectConstructor } from "./kube-object";
+
+export interface CreateKubeApiForLocalClusterConfig {
+  metadata: {
+    uid: string;
+  };
+}
+
+export interface CreateKubeApiForCluster {
+  <Object extends KubeObject, Api extends KubeApi<Object>, Data extends KubeJsonApiDataFor<Object>>(
+    cluster: CreateKubeApiForLocalClusterConfig,
+    kubeClass: KubeObjectConstructor<Object, Data>,
+    apiClass: new (apiOpts: KubeApiOptions<Object>) => Api
+  ): Api;
+  <Object extends KubeObject, Data extends KubeJsonApiDataFor<Object>>(
+    cluster: CreateKubeApiForLocalClusterConfig,
+    kubeClass: KubeObjectConstructor<Object, Data>,
+    apiClass?: new (apiOpts: KubeApiOptions<Object>) => KubeApi<Object>
+  ): KubeApi<Object>;
+}
+
+const createKubeApiForClusterInjectable = getInjectable({
+  id: "create-kube-api-for-cluster",
+  instantiate: (di): CreateKubeApiForCluster => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+    const isDevelopment = di.inject(isDevelopmentInjectable);
+    const createKubeJsonApi = di.inject(createKubeJsonApiInjectable);
+
+    return (
+      cluster: CreateKubeApiForLocalClusterConfig,
+      kubeClass: KubeObjectConstructor<KubeObject, KubeJsonApiDataFor<KubeObject>>,
+      apiClass = KubeApi,
+    ) => (
+      new apiClass({
+        objectConstructor: kubeClass,
+        request: createKubeJsonApi(
+          {
+            serverAddress: apiBase.config.serverAddress,
+            apiBase: apiKubePrefix,
+            debug: isDevelopment,
+          }, {
+            headers: {
+              "Host": `${cluster.metadata.uid}.localhost:${new URL(apiBase.config.serverAddress).port}`,
+            },
+          },
+        ),
+      })
+    );
+  },
+});
+
+export default createKubeApiForClusterInjectable;
diff --git a/src/common/k8s-api/create-kube-api-for-remote-cluster.injectable.ts b/src/common/k8s-api/create-kube-api-for-remote-cluster.injectable.ts
new file mode 100644
index 0000000000..d11b7ae34b
--- /dev/null
+++ b/src/common/k8s-api/create-kube-api-for-remote-cluster.injectable.ts
@@ -0,0 +1,104 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { AgentOptions } from "https";
+import { Agent } from "https";
+import type { RequestInit } from "node-fetch";
+import isDevelopmentInjectable from "../vars/is-development.injectable";
+import createKubeJsonApiInjectable from "./create-kube-json-api.injectable";
+import type { KubeApiOptions } from "./kube-api";
+import { KubeApi } from "./kube-api";
+import type { KubeJsonApiDataFor, KubeObject, KubeObjectConstructor } from "./kube-object";
+
+export interface CreateKubeApiForRemoteClusterConfig {
+  cluster: {
+    server: string;
+    caData?: string;
+    skipTLSVerify?: boolean;
+  };
+  user: {
+    token?: string | (() => Promise<string>);
+    clientCertificateData?: string;
+    clientKeyData?: string;
+  };
+  /**
+   * Custom instance of https.agent to use for the requests
+   *
+   * @remarks the custom agent replaced default agent, options skipTLSVerify,
+   * clientCertificateData, clientKeyData and caData are ignored.
+   */
+   agent?: Agent;
+}
+
+export interface CreateKubeApiForRemoteCluster {
+  <Object extends KubeObject, Api extends KubeApi<Object>, Data extends KubeJsonApiDataFor<Object>>(
+    config: CreateKubeApiForRemoteClusterConfig,
+    kubeClass: KubeObjectConstructor<Object, Data>,
+    apiClass: new (apiOpts: KubeApiOptions<Object>) => Api,
+  ): Api;
+  <Object extends KubeObject, Data extends KubeJsonApiDataFor<Object>>(
+    config: CreateKubeApiForRemoteClusterConfig,
+    kubeClass: KubeObjectConstructor<Object, Data>,
+    apiClass?: new (apiOpts: KubeApiOptions<Object>) => KubeApi<Object>,
+  ): KubeApi<Object>;
+}
+
+const createKubeApiForRemoteClusterInjectable = getInjectable({
+  id: "create-kube-api-for-remote-cluster",
+  instantiate: (di): CreateKubeApiForRemoteCluster => {
+    const isDevelopment = di.inject(isDevelopmentInjectable);
+    const createKubeJsonApi = di.inject(createKubeJsonApiInjectable);
+
+    return (config: CreateKubeApiForRemoteClusterConfig, kubeClass: KubeObjectConstructor<KubeObject, KubeJsonApiDataFor<KubeObject>>, apiClass = KubeApi) => {
+      const reqInit: RequestInit = {};
+      const agentOptions: AgentOptions = {};
+
+      if (config.cluster.skipTLSVerify === true) {
+        agentOptions.rejectUnauthorized = false;
+      }
+
+      if (config.user.clientCertificateData) {
+        agentOptions.cert = config.user.clientCertificateData;
+      }
+
+      if (config.user.clientKeyData) {
+        agentOptions.key = config.user.clientKeyData;
+      }
+
+      if (config.cluster.caData) {
+        agentOptions.ca = config.cluster.caData;
+      }
+
+      if (Object.keys(agentOptions).length > 0) {
+        reqInit.agent = new Agent(agentOptions);
+      }
+
+      if (config.agent) {
+        reqInit.agent = config.agent;
+      }
+
+      const token = config.user.token;
+      const request = createKubeJsonApi({
+        serverAddress: config.cluster.server,
+        apiBase: "",
+        debug: isDevelopment,
+        ...(token ? {
+          getRequestOptions: async () => ({
+            headers: {
+              "Authorization": `Bearer ${typeof token === "function" ? await token() : token}`,
+            },
+          }),
+        } : {}),
+      }, reqInit);
+
+      return new apiClass({
+        objectConstructor: kubeClass,
+        request,
+      });
+    };
+  },
+});
+
+export default createKubeApiForRemoteClusterInjectable;
diff --git a/src/common/k8s-api/create-kube-json-api-for-cluster.injectable.ts b/src/common/k8s-api/create-kube-json-api-for-cluster.injectable.ts
new file mode 100644
index 0000000000..9901731c94
--- /dev/null
+++ b/src/common/k8s-api/create-kube-json-api-for-cluster.injectable.ts
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { apiKubePrefix } from "../vars";
+import isDebuggingInjectable from "../vars/is-debugging.injectable";
+import { apiBaseInjectionToken } from "./api-base";
+import createKubeJsonApiInjectable from "./create-kube-json-api.injectable";
+import type { KubeJsonApi } from "./kube-json-api";
+
+export type CreateKubeJsonApiForCluster = (clusterId: string) => KubeJsonApi;
+
+const createKubeJsonApiForClusterInjectable = getInjectable({
+  id: "create-kube-json-api-for-cluster",
+  instantiate: (di): CreateKubeJsonApiForCluster => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+    const createKubeJsonApi = di.inject(createKubeJsonApiInjectable);
+    const isDebugging = di.inject(isDebuggingInjectable);
+
+    return (clusterId) => createKubeJsonApi(
+      {
+        serverAddress: apiBase.config.serverAddress,
+        apiBase: apiKubePrefix,
+        debug: isDebugging,
+      },
+      {
+        headers: {
+          "Host": `${clusterId}.localhost:${new URL(apiBase.config.serverAddress).port}`,
+        },
+      },
+    );
+  },
+});
+
+export default createKubeJsonApiForClusterInjectable;
diff --git a/src/common/k8s-api/create-kube-json-api.injectable.ts b/src/common/k8s-api/create-kube-json-api.injectable.ts
new file mode 100644
index 0000000000..93de5a0d21
--- /dev/null
+++ b/src/common/k8s-api/create-kube-json-api.injectable.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { RequestInit } from "node-fetch";
+import fetchInjectable from "../fetch/fetch.injectable";
+import loggerInjectable from "../logger.injectable";
+import type { JsonApiConfig, JsonApiDependencies } from "./json-api";
+import { KubeJsonApi } from "./kube-json-api";
+
+export type CreateKubeJsonApi = (config: JsonApiConfig, reqInit?: RequestInit) => KubeJsonApi;
+
+const createKubeJsonApiInjectable = getInjectable({
+  id: "create-kube-json-api",
+  instantiate: (di): CreateKubeJsonApi => {
+    const dependencies: JsonApiDependencies = {
+      fetch: di.inject(fetchInjectable),
+      logger: di.inject(loggerInjectable),
+    };
+
+    return (config, reqInit) => new KubeJsonApi(dependencies, config, reqInit);
+  },
+});
+
+export default createKubeJsonApiInjectable;
diff --git a/src/common/k8s-api/endpoints/cluster.api.ts b/src/common/k8s-api/endpoints/cluster.api.ts
index 082f0adb09..aae4c239ad 100644
--- a/src/common/k8s-api/endpoints/cluster.api.ts
+++ b/src/common/k8s-api/endpoints/cluster.api.ts
@@ -3,8 +3,6 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { MetricData, IMetricsReqParams } from "./metrics.api";
-import { metricsApi } from "./metrics.api";
 import { KubeObject } from "../kube-object";
 import type { DerivedKubeApiOptions, IgnoredKubeApiOptions } from "../kube-api";
 import { KubeApi } from "../kube-api";
@@ -28,30 +26,6 @@ export class ClusterApi extends KubeApi<Cluster> {
   }
 }
 
-export function getMetricsByNodeNames(nodeNames: string[], params?: IMetricsReqParams): Promise<ClusterMetricData> {
-  const nodes = nodeNames.join("|");
-  const opts = { category: "cluster", nodes };
-
-  return metricsApi.getMetrics({
-    memoryUsage: opts,
-    workloadMemoryUsage: opts,
-    memoryRequests: opts,
-    memoryLimits: opts,
-    memoryCapacity: opts,
-    memoryAllocatableCapacity: opts,
-    cpuUsage: opts,
-    cpuRequests: opts,
-    cpuLimits: opts,
-    cpuCapacity: opts,
-    cpuAllocatableCapacity: opts,
-    podUsage: opts,
-    podCapacity: opts,
-    podAllocatableCapacity: opts,
-    fsSize: opts,
-    fsUsage: opts,
-  }, params);
-}
-
 export enum ClusterStatus {
   ACTIVE = "Active",
   CREATING = "Creating",
@@ -59,21 +33,6 @@ export enum ClusterStatus {
   ERROR = "Error",
 }
 
-export interface ClusterMetricData extends Partial<Record<string, MetricData>> {
-  memoryUsage: MetricData;
-  memoryRequests: MetricData;
-  memoryLimits: MetricData;
-  memoryCapacity: MetricData;
-  cpuUsage: MetricData;
-  cpuRequests: MetricData;
-  cpuLimits: MetricData;
-  cpuCapacity: MetricData;
-  podUsage: MetricData;
-  podCapacity: MetricData;
-  fsSize: MetricData;
-  fsUsage: MetricData;
-}
-
 export interface Cluster {
   spec: {
     clusterNetwork?: {
diff --git a/src/common/k8s-api/endpoints/cron-job.api.injectable.ts b/src/common/k8s-api/endpoints/cron-job.api.injectable.ts
index a22909861e..e2230ee2db 100644
--- a/src/common/k8s-api/endpoints/cron-job.api.injectable.ts
+++ b/src/common/k8s-api/endpoints/cron-job.api.injectable.ts
@@ -13,7 +13,9 @@ const cronJobApiInjectable = getInjectable({
   instantiate: (di) => {
     assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "cronJobApi is only available in certain environments");
 
-    return new CronJobApi();
+    return new CronJobApi({
+      checkPreferredVersion: true,
+    });
   },
 
   injectionToken: kubeApiInjectionToken,
diff --git a/src/common/k8s-api/endpoints/cron-job.api.ts b/src/common/k8s-api/endpoints/cron-job.api.ts
index 131b632589..7dad6a857d 100644
--- a/src/common/k8s-api/endpoints/cron-job.api.ts
+++ b/src/common/k8s-api/endpoints/cron-job.api.ts
@@ -73,7 +73,7 @@ export class CronJob extends KubeObject<
 > {
   static readonly kind = "CronJob";
   static readonly namespaced = true;
-  static readonly apiBase = "/apis/batch/v1beta1/cronjobs";
+  static readonly apiBase = "/apis/batch/v1/cronjobs";
 
   getSuspendFlag() {
     return (this.spec.suspend ?? false).toString();
diff --git a/src/common/k8s-api/endpoints/daemon-set.api.ts b/src/common/k8s-api/endpoints/daemon-set.api.ts
index f023652306..49719b04f9 100644
--- a/src/common/k8s-api/endpoints/daemon-set.api.ts
+++ b/src/common/k8s-api/endpoints/daemon-set.api.ts
@@ -5,8 +5,6 @@
 
 import type { DerivedKubeApiOptions, IgnoredKubeApiOptions } from "../kube-api";
 import { KubeApi } from "../kube-api";
-import { metricsApi } from "./metrics.api";
-import type { PodMetricData } from "./pod.api";
 import type { KubeObjectStatus, LabelSelector, NamespaceScopedMetadata } from "../kube-object";
 import { KubeObject } from "../kube-object";
 import type { PodTemplateSpec } from "./types/pod-template-spec";
@@ -90,20 +88,3 @@ export class DaemonSetApi extends KubeApi<DaemonSet> {
     });
   }
 }
-
-export function getMetricsForDaemonSets(daemonsets: DaemonSet[], namespace: string, selector = ""): Promise<PodMetricData> {
-  const podSelector = daemonsets.map(daemonset => `${daemonset.getName()}-[[:alnum:]]{5}`).join("|");
-  const opts = { category: "pods", pods: podSelector, namespace, selector };
-
-  return metricsApi.getMetrics({
-    cpuUsage: opts,
-    memoryUsage: opts,
-    fsUsage: opts,
-    fsWrites: opts,
-    fsReads: opts,
-    networkReceive: opts,
-    networkTransmit: opts,
-  }, {
-    namespace,
-  });
-}
diff --git a/src/common/k8s-api/endpoints/deployment.api.ts b/src/common/k8s-api/endpoints/deployment.api.ts
index f67f26f70f..318ea8563f 100644
--- a/src/common/k8s-api/endpoints/deployment.api.ts
+++ b/src/common/k8s-api/endpoints/deployment.api.ts
@@ -7,8 +7,7 @@ import moment from "moment";
 
 import type { DerivedKubeApiOptions } from "../kube-api";
 import { KubeApi } from "../kube-api";
-import { metricsApi } from "./metrics.api";
-import type { PodMetricData, PodSpec } from "./pod.api";
+import type { PodSpec } from "./pod.api";
 import type { KubeObjectStatus, LabelSelector, NamespaceScopedMetadata } from "../kube-object";
 import { KubeObject } from "../kube-object";
 import { hasTypedProperty, isNumber, isObject } from "../../utils";
@@ -70,23 +69,6 @@ export class DeploymentApi extends KubeApi<Deployment> {
   }
 }
 
-export function getMetricsForDeployments(deployments: Deployment[], namespace: string, selector = ""): Promise<PodMetricData> {
-  const podSelector = deployments.map(deployment => `${deployment.getName()}-[[:alnum:]]{9,}-[[:alnum:]]{5}`).join("|");
-  const opts = { category: "pods", pods: podSelector, namespace, selector };
-
-  return metricsApi.getMetrics({
-    cpuUsage: opts,
-    memoryUsage: opts,
-    fsUsage: opts,
-    fsWrites: opts,
-    fsReads: opts,
-    networkReceive: opts,
-    networkTransmit: opts,
-  }, {
-    namespace,
-  });
-}
-
 export interface DeploymentSpec {
   replicas: number;
   selector: LabelSelector;
diff --git a/src/common/k8s-api/endpoints/helm-charts.api.ts b/src/common/k8s-api/endpoints/helm-charts.api.ts
index f4ba0cf45f..26da740830 100644
--- a/src/common/k8s-api/endpoints/helm-charts.api.ts
+++ b/src/common/k8s-api/endpoints/helm-charts.api.ts
@@ -3,72 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { compile } from "path-to-regexp";
-import { apiBase } from "../index";
-import { stringify } from "querystring";
-import type { RequestInit } from "node-fetch";
-import { autoBind, bifurcateArray, isDefined } from "../../utils";
+import { autoBind, bifurcateArray } from "../../utils";
 import Joi from "joi";
 
-export type RepoHelmChartList = Record<string, RawHelmChart[]>;
-
-export interface IHelmChartDetails {
-  readme: string;
-  versions: HelmChart[];
-}
-
-const endpoint = compile(`/v2/charts/:repo?/:name?`) as (params?: {
-  repo?: string;
-  name?: string;
-}) => string;
-
-/**
- * Get a list of all helm charts from all saved helm repos
- */
-export async function listCharts(): Promise<HelmChart[]> {
-  const data = await apiBase.get<Record<string, RepoHelmChartList>>(endpoint());
-
-  return Object
-    .values(data)
-    .reduce((allCharts, repoCharts) => allCharts.concat(Object.values(repoCharts)), new Array<RawHelmChart[]>())
-    .map(([chart]) => HelmChart.create(chart, { onError: "log" }))
-    .filter(isDefined);
-}
-
-export interface GetChartDetailsOptions {
-  version?: string;
-  reqInit?: RequestInit;
-}
-
-/**
- * Get the readme and all versions of a chart
- * @param repo The repo to get from
- * @param name The name of the chart to request the data of
- * @param options.version The version of the chart's readme to get, default latest
- * @param options.reqInit A way for passing in an abort controller or other browser request options
- */
-export async function getChartDetails(repo: string, name: string, { version, reqInit }: GetChartDetailsOptions = {}): Promise<IHelmChartDetails> {
-  const path = endpoint({ repo, name });
-
-  const { readme, ...data } = await apiBase.get<IHelmChartDetails>(`${path}?${stringify({ version })}`, undefined, reqInit);
-  const versions = data.versions.map(version => HelmChart.create(version, { onError: "log" })).filter(isDefined);
-
-  return {
-    readme,
-    versions,
-  };
-}
-
-/**
- * Get chart values related to a specific repos' version of a chart
- * @param repo The repo to get from
- * @param name The name of the chart to request the data of
- * @param version The version to get the values from
- */
-export async function getChartValues(repo: string, name: string, version: string): Promise<string> {
-  return apiBase.get<string>(`/v2/charts/${repo}/${name}/values?${stringify({ version })}`);
-}
-
 export interface RawHelmChart {
   apiVersion: string;
   name: string;
diff --git a/src/common/k8s-api/endpoints/helm-charts.api/request-charts.injectable.ts b/src/common/k8s-api/endpoints/helm-charts.api/request-charts.injectable.ts
new file mode 100644
index 0000000000..89de5f9d17
--- /dev/null
+++ b/src/common/k8s-api/endpoints/helm-charts.api/request-charts.injectable.ts
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { apiBaseInjectionToken } from "../../api-base";
+import type { RawHelmChart } from "../helm-charts.api";
+import { HelmChart } from "../helm-charts.api";
+import { isDefined } from "../../../utils";
+
+export type RequestHelmCharts = () => Promise<HelmChart[]>;
+export type RepoHelmChartList = Record<string, RawHelmChart[]>;
+
+/**
+ * Get a list of all helm charts from all saved helm repos
+ */
+const requestHelmChartsInjectable = getInjectable({
+  id: "request-helm-charts",
+  instantiate: (di) => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return async () => {
+      const data = await apiBase.get<Record<string, RepoHelmChartList>>("/v2/charts");
+
+      return Object
+        .values(data)
+        .reduce((allCharts, repoCharts) => allCharts.concat(Object.values(repoCharts)), new Array<RawHelmChart[]>())
+        .map(([chart]) => HelmChart.create(chart, { onError: "log" }))
+        .filter(isDefined);
+    };
+  },
+});
+
+export default requestHelmChartsInjectable;
diff --git a/src/common/k8s-api/endpoints/helm-charts.api/request-readme.injectable.ts b/src/common/k8s-api/endpoints/helm-charts.api/request-readme.injectable.ts
new file mode 100644
index 0000000000..c6815c4b93
--- /dev/null
+++ b/src/common/k8s-api/endpoints/helm-charts.api/request-readme.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { urlBuilderFor } from "../../../utils/buildUrl";
+import { apiBaseInjectionToken } from "../../api-base";
+
+const requestReadmeEndpoint = urlBuilderFor("/v2/charts/:repo/:name/readme");
+
+export type RequestHelmChartReadme = (repo: string, name: string, version?: string) => Promise<string>;
+
+const requestHelmChartReadmeInjectable = getInjectable({
+  id: "request-helm-chart-readme",
+  instantiate: (di): RequestHelmChartReadme => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return (repo, name, version) => (
+      apiBase.get(requestReadmeEndpoint.compile({ name, repo }, { version }))
+    );
+  },
+});
+
+export default requestHelmChartReadmeInjectable;
diff --git a/src/common/k8s-api/endpoints/helm-charts.api/request-values.injectable.ts b/src/common/k8s-api/endpoints/helm-charts.api/request-values.injectable.ts
new file mode 100644
index 0000000000..ec927fc37a
--- /dev/null
+++ b/src/common/k8s-api/endpoints/helm-charts.api/request-values.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { urlBuilderFor } from "../../../utils/buildUrl";
+import { apiBaseInjectionToken } from "../../api-base";
+
+const requestValuesEndpoint = urlBuilderFor("/v2/charts/:repo/:name/values");
+
+export type RequestHelmChartValues = (repo: string, name: string, version: string) => Promise<string>;
+
+const requestHelmChartValuesInjectable = getInjectable({
+  id: "request-helm-chart-values",
+  instantiate: (di): RequestHelmChartValues => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return (repo, name, version) => (
+      apiBase.get(requestValuesEndpoint.compile({ repo, name }, { version }))
+    );
+  },
+});
+
+export default requestHelmChartValuesInjectable;
diff --git a/src/common/k8s-api/endpoints/helm-charts.api/request-versions.injectable.ts b/src/common/k8s-api/endpoints/helm-charts.api/request-versions.injectable.ts
new file mode 100644
index 0000000000..410d8ea596
--- /dev/null
+++ b/src/common/k8s-api/endpoints/helm-charts.api/request-versions.injectable.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { urlBuilderFor } from "../../../utils/buildUrl";
+import { apiBaseInjectionToken } from "../../api-base";
+import { HelmChart } from "../helm-charts.api";
+import type { RawHelmChart } from "../helm-charts.api";
+import { isDefined } from "../../../utils";
+
+const requestVersionsEndpoint = urlBuilderFor("/v2/charts/:repo/:name/versions");
+
+export type RequestHelmChartVersions = (repo: string, chartName: string) => Promise<HelmChart[]>;
+
+const requestHelmChartVersionsInjectable = getInjectable({
+  id: "request-helm-chart-versions",
+  instantiate: (di): RequestHelmChartVersions => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return async (repo, name) => {
+      const rawVersions = await apiBase.get(requestVersionsEndpoint.compile({ name, repo })) as RawHelmChart[];
+
+      return rawVersions
+        .map(version => HelmChart.create(version, { onError: "log" }))
+        .filter(isDefined);
+    };
+  },
+});
+
+export default requestHelmChartVersionsInjectable;
diff --git a/src/common/k8s-api/endpoints/helm-releases.api.ts b/src/common/k8s-api/endpoints/helm-releases.api.ts
index f9e11073c0..3460378e59 100644
--- a/src/common/k8s-api/endpoints/helm-releases.api.ts
+++ b/src/common/k8s-api/endpoints/helm-releases.api.ts
@@ -3,65 +3,14 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { apiBase } from "../index";
 import type { ItemObject } from "../../item.store";
-import type { JsonApiData } from "../json-api";
-import { buildURLPositional } from "../../utils/buildUrl";
-import type { HelmReleaseDetails } from "../../../renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release-details/call-for-helm-release-details.injectable";
+import type { HelmReleaseDetails } from "./helm-releases.api/request-details.injectable";
 
 export interface HelmReleaseUpdateDetails {
   log: string;
   release: HelmReleaseDetails;
 }
 
-export interface HelmReleaseRevision {
-  revision: number;
-  updated: string;
-  status: string;
-  chart: string;
-  app_version: string;
-  description: string;
-}
-
-type EndpointParams = {}
-  | { namespace: string }
-  | { namespace: string; name: string }
-  | { namespace: string; name: string; route: string };
-
-interface EndpointQuery {
-  all?: boolean;
-}
-
-export const endpoint = buildURLPositional<EndpointParams, EndpointQuery>("/v2/releases/:namespace?/:name?/:route?");
-
-export async function deleteRelease(name: string, namespace: string): Promise<JsonApiData> {
-  const path = endpoint({ name, namespace });
-
-  return apiBase.del(path);
-}
-
-export async function getReleaseValues(name: string, namespace: string, all?: boolean): Promise<string> {
-  const route = "values";
-  const path = endpoint({ name, namespace, route }, { all });
-
-  return apiBase.get<string>(path);
-}
-
-export async function getReleaseHistory(name: string, namespace: string): Promise<HelmReleaseRevision[]> {
-  const route = "history";
-  const path = endpoint({ name, namespace, route });
-
-  return apiBase.get(path);
-}
-
-export async function rollbackRelease(name: string, namespace: string, revision: number): Promise<JsonApiData> {
-  const route = "rollback";
-  const path = endpoint({ name, namespace, route });
-  const data = { revision };
-
-  return apiBase.put(path, { data });
-}
-
 export interface HelmReleaseDto {
   appVersion: string;
   name: string;
diff --git a/src/common/k8s-api/endpoints/helm-releases.api/request-configuration.global-override-for-injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-configuration.global-override-for-injectable.ts
new file mode 100644
index 0000000000..18b3bd0ec0
--- /dev/null
+++ b/src/common/k8s-api/endpoints/helm-releases.api/request-configuration.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../../../test-utils/get-global-override";
+import requestHelmReleaseConfigurationInjectable from "./request-configuration.injectable";
+
+export default getGlobalOverride(requestHelmReleaseConfigurationInjectable, () => () => {
+  throw new Error("Tried to call requestHelmReleaseConfiguration with no override");
+});
diff --git a/src/common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable.ts
new file mode 100644
index 0000000000..1bfe168b11
--- /dev/null
+++ b/src/common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable.ts
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { urlBuilderFor } from "../../../utils/buildUrl";
+import { apiBaseInjectionToken } from "../../api-base";
+
+export type RequestHelmReleaseConfiguration = (
+  name: string,
+  namespace: string,
+  all: boolean
+) => Promise<string>;
+
+const requestConfigurationEnpoint = urlBuilderFor("/v2/releases/:namespace/:name/values");
+
+const requestHelmReleaseConfigurationInjectable = getInjectable({
+  id: "request-helm-release-configuration",
+
+  instantiate: (di): RequestHelmReleaseConfiguration => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return (name, namespace, all: boolean) => (
+      apiBase.get(requestConfigurationEnpoint.compile({ name, namespace }, { all }))
+    );
+  },
+});
+
+export default requestHelmReleaseConfigurationInjectable;
diff --git a/src/common/k8s-api/endpoints/helm-releases.api/request-create.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-create.injectable.ts
new file mode 100644
index 0000000000..bad802d3cc
--- /dev/null
+++ b/src/common/k8s-api/endpoints/helm-releases.api/request-create.injectable.ts
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import yaml from "js-yaml";
+import { getInjectable } from "@ogre-tools/injectable";
+import type { HelmReleaseUpdateDetails } from "../helm-releases.api";
+import { apiBaseInjectionToken } from "../../api-base";
+import { urlBuilderFor } from "../../../utils/buildUrl";
+
+interface HelmReleaseCreatePayload {
+  name?: string;
+  repo: string;
+  chart: string;
+  namespace: string;
+  version: string;
+  values: string;
+}
+
+export type RequestCreateHelmRelease = (payload: HelmReleaseCreatePayload) => Promise<HelmReleaseUpdateDetails>;
+
+const requestCreateEndpoint = urlBuilderFor("/v2/releases");
+
+const requestCreateHelmReleaseInjectable = getInjectable({
+  id: "request-create-helm-release",
+
+  instantiate: (di): RequestCreateHelmRelease => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return ({ repo, chart, values, ...data }) => {
+      return apiBase.post(requestCreateEndpoint.compile({}), {
+        data: {
+          chart: `${repo}/${chart}`,
+          values: yaml.load(values),
+          ...data,
+        },
+      });
+    };
+  },
+});
+
+export default requestCreateHelmReleaseInjectable;
diff --git a/src/common/k8s-api/endpoints/helm-releases.api/request-delete.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-delete.injectable.ts
new file mode 100644
index 0000000000..66b2013770
--- /dev/null
+++ b/src/common/k8s-api/endpoints/helm-releases.api/request-delete.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { urlBuilderFor } from "../../../utils/buildUrl";
+import { apiBaseInjectionToken } from "../../api-base";
+
+export type RequestDeleteHelmRelease = (name: string, namespace: string) => Promise<void>;
+
+const requestDeleteEndpoint = urlBuilderFor("/v2/releases/:namespace/:name");
+
+const requestDeleteHelmReleaseInjectable = getInjectable({
+  id: "request-delete-helm-release",
+  instantiate: (di): RequestDeleteHelmRelease => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return (name, namespace) => apiBase.del(requestDeleteEndpoint.compile({ name, namespace }));
+  },
+});
+
+export default requestDeleteHelmReleaseInjectable;
diff --git a/src/common/k8s-api/endpoints/helm-releases.api/request-details.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-details.injectable.ts
new file mode 100644
index 0000000000..0b712cd78e
--- /dev/null
+++ b/src/common/k8s-api/endpoints/helm-releases.api/request-details.injectable.ts
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { KubeJsonApiData } from "../../kube-json-api";
+import { apiBaseInjectionToken } from "../../api-base";
+import { urlBuilderFor } from "../../../utils/buildUrl";
+
+export interface HelmReleaseDetails {
+  resources: KubeJsonApiData[];
+  name: string;
+  namespace: string;
+  version: string;
+  config: string; // release values
+  manifest: string;
+  info: {
+    deleted: string;
+    description: string;
+    first_deployed: string;
+    last_deployed: string;
+    notes: string;
+    status: string;
+  };
+}
+
+export type CallForHelmReleaseDetails = (name: string, namespace: string) => Promise<HelmReleaseDetails>;
+
+const requestDetailsEnpoint = urlBuilderFor("/v2/releases/:namespace/:name");
+
+const requestHelmReleaseDetailsInjectable = getInjectable({
+  id: "call-for-helm-release-details",
+
+  instantiate: (di): CallForHelmReleaseDetails => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return (name, namespace) => apiBase.get(requestDetailsEnpoint.compile({ name, namespace }));
+  },
+});
+
+export default requestHelmReleaseDetailsInjectable;
diff --git a/src/common/k8s-api/endpoints/helm-releases.api/request-history.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-history.injectable.ts
new file mode 100644
index 0000000000..b6e9794fe7
--- /dev/null
+++ b/src/common/k8s-api/endpoints/helm-releases.api/request-history.injectable.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { urlBuilderFor } from "../../../utils/buildUrl";
+import { apiBaseInjectionToken } from "../../api-base";
+
+export interface HelmReleaseRevision {
+  revision: number;
+  updated: string;
+  status: string;
+  chart: string;
+  app_version: string;
+  description: string;
+}
+
+export type RequestHelmReleaseHistory = (name: string, namespace: string) => Promise<HelmReleaseRevision[]>;
+
+const requestHistoryEnpoint = urlBuilderFor("/v2/releases/:namespace/:name/history");
+
+const requestHelmReleaseHistoryInjectable = getInjectable({
+  id: "request-helm-release-history",
+  instantiate: (di): RequestHelmReleaseHistory => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return (name, namespace) => apiBase.get(requestHistoryEnpoint.compile({ name, namespace }));
+  },
+});
+
+export default requestHelmReleaseHistoryInjectable;
diff --git a/src/common/k8s-api/endpoints/helm-releases.api/request-releases.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-releases.injectable.ts
new file mode 100644
index 0000000000..2619e289c6
--- /dev/null
+++ b/src/common/k8s-api/endpoints/helm-releases.api/request-releases.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { urlBuilderFor } from "../../../utils/buildUrl";
+import { apiBaseInjectionToken } from "../../api-base";
+import type { HelmReleaseDto } from "../helm-releases.api";
+
+export type RequestHelmReleases = (namespace?: string) => Promise<HelmReleaseDto[]>;
+
+const requestHelmReleasesEndpoint = urlBuilderFor("/v2/releases/:namespace?");
+
+const requestHelmReleasesInjectable = getInjectable({
+  id: "request-helm-releases",
+
+  instantiate: (di): RequestHelmReleases => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return (namespace) => apiBase.get(requestHelmReleasesEndpoint.compile({ namespace }));
+  },
+});
+
+export default requestHelmReleasesInjectable;
diff --git a/src/common/k8s-api/endpoints/helm-releases.api/request-rollback.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-rollback.injectable.ts
new file mode 100644
index 0000000000..1a9229b73a
--- /dev/null
+++ b/src/common/k8s-api/endpoints/helm-releases.api/request-rollback.injectable.ts
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { urlBuilderFor } from "../../../utils/buildUrl";
+import { apiBaseInjectionToken } from "../../api-base";
+
+export type RequestHelmReleaseRollback = (name: string, namespace: string, revision: number) => Promise<void>;
+
+const requestRollbackEndpoint = urlBuilderFor("/v2/releases/:namespace/:name");
+
+const requestHelmReleaseRollbackInjectable = getInjectable({
+  id: "request-helm-release-rollback",
+  instantiate: (di): RequestHelmReleaseRollback => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return async (name, namespace, revision) => {
+      await apiBase.put(
+        requestRollbackEndpoint.compile({ name, namespace }),
+        { data: { revision }},
+      );
+    };
+  },
+});
+
+export default requestHelmReleaseRollbackInjectable;
diff --git a/src/common/k8s-api/endpoints/helm-releases.api/request-update.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-update.injectable.ts
new file mode 100644
index 0000000000..8f46a3a210
--- /dev/null
+++ b/src/common/k8s-api/endpoints/helm-releases.api/request-update.injectable.ts
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { apiBaseInjectionToken } from "../../api-base";
+import { urlBuilderFor } from "../../../utils/buildUrl";
+import type { AsyncResult } from "../../../utils/async-result";
+
+interface HelmReleaseUpdatePayload {
+  repo: string;
+  chart: string;
+  version: string;
+  values: string;
+}
+
+export type RequestHelmReleaseUpdate = (
+  name: string,
+  namespace: string,
+  payload: HelmReleaseUpdatePayload
+) => Promise<AsyncResult<void, unknown>>;
+
+const requestUpdateEndpoint = urlBuilderFor("/v2/releases/:namespace/:name");
+
+const requestHelmReleaseUpdateInjectable = getInjectable({
+  id: "request-helm-release-update",
+
+  instantiate: (di): RequestHelmReleaseUpdate => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return async (name, namespace, { repo, chart, values, version }) => {
+      try {
+        await apiBase.put(requestUpdateEndpoint.compile({ name, namespace }), {
+          data: {
+            chart: `${repo}/${chart}`,
+            values,
+            version,
+          },
+        });
+      } catch (e) {
+        return { callWasSuccessful: false, error: e };
+      }
+
+      return { callWasSuccessful: true };
+    };
+  },
+});
+
+export default requestHelmReleaseUpdateInjectable;
diff --git a/src/common/k8s-api/endpoints/helm-releases.api/request-values.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-values.injectable.ts
new file mode 100644
index 0000000000..d30f9973c4
--- /dev/null
+++ b/src/common/k8s-api/endpoints/helm-releases.api/request-values.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { urlBuilderFor } from "../../../utils/buildUrl";
+import { apiBaseInjectionToken } from "../../api-base";
+
+export type RequestHelmReleaseValues = (name: string, namespace: string, all?: boolean) => Promise<string>;
+
+const requestValuesEndpoint = urlBuilderFor("/v2/release/:namespace/:name/values");
+
+const requestHelmReleaseValuesInjectable = getInjectable({
+  id: "request-helm-release-values",
+  instantiate: (di): RequestHelmReleaseValues => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return (name, namespace, all) => apiBase.get(requestValuesEndpoint.compile({ name, namespace }, { all }));
+  },
+});
+
+export default requestHelmReleaseValuesInjectable;
diff --git a/src/common/k8s-api/endpoints/index.ts b/src/common/k8s-api/endpoints/index.ts
index 0e2e677521..c0493e6370 100644
--- a/src/common/k8s-api/endpoints/index.ts
+++ b/src/common/k8s-api/endpoints/index.ts
@@ -19,6 +19,7 @@ export * from "./events.api";
 export * from "./horizontal-pod-autoscaler.api";
 export * from "./ingress.api";
 export * from "./job.api";
+export * from "./lease.api";
 export * from "./limit-range.api";
 export * from "./namespace.api";
 export * from "./network-policy.api";
@@ -34,6 +35,7 @@ export * from "./replica-set.api";
 export * from "./resource-quota.api";
 export * from "./role.api";
 export * from "./role-binding.api";
+export * from "./runtime-class.api";
 export * from "./secret.api";
 export * from "./self-subject-rules-reviews.api";
 export * from "./service.api";
diff --git a/src/common/k8s-api/endpoints/ingress.api.ts b/src/common/k8s-api/endpoints/ingress.api.ts
index 84910d2783..d223530013 100644
--- a/src/common/k8s-api/endpoints/ingress.api.ts
+++ b/src/common/k8s-api/endpoints/ingress.api.ts
@@ -6,8 +6,6 @@
 import type { NamespaceScopedMetadata, TypedLocalObjectReference } from "../kube-object";
 import { KubeObject } from "../kube-object";
 import { hasTypedProperty, isString, iter } from "../../utils";
-import type { MetricData } from "./metrics.api";
-import { metricsApi } from "./metrics.api";
 import type { DerivedKubeApiOptions, IgnoredKubeApiOptions } from "../kube-api";
 import { KubeApi } from "../kube-api";
 import type { RequireExactlyOne } from "type-fest";
@@ -24,26 +22,6 @@ export class IngressApi extends KubeApi<Ingress> {
   }
 }
 
-export function getMetricsForIngress(ingress: string, namespace: string): Promise<IngressMetricData> {
-  const opts = { category: "ingress", ingress, namespace };
-
-  return metricsApi.getMetrics({
-    bytesSentSuccess: opts,
-    bytesSentFailure: opts,
-    requestDurationSeconds: opts,
-    responseDurationSeconds: opts,
-  }, {
-    namespace,
-  });
-}
-
-export interface IngressMetricData extends Partial<Record<string, MetricData>> {
-  bytesSentSuccess: MetricData;
-  bytesSentFailure: MetricData;
-  requestDurationSeconds: MetricData;
-  responseDurationSeconds: MetricData;
-}
-
 export interface ILoadBalancerIngress {
   hostname?: string;
   ip?: string;
diff --git a/src/common/k8s-api/endpoints/job.api.injectable.ts b/src/common/k8s-api/endpoints/job.api.injectable.ts
index a9c4252e59..fc25c8c61f 100644
--- a/src/common/k8s-api/endpoints/job.api.injectable.ts
+++ b/src/common/k8s-api/endpoints/job.api.injectable.ts
@@ -13,7 +13,9 @@ const jobApiInjectable = getInjectable({
   instantiate: (di) => {
     assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "jobApi is only available in certain environments");
 
-    return new JobApi();
+    return new JobApi({
+      checkPreferredVersion: true,
+    });
   },
 
   injectionToken: kubeApiInjectionToken,
diff --git a/src/common/k8s-api/endpoints/job.api.ts b/src/common/k8s-api/endpoints/job.api.ts
index 84e166ecc4..66f4ef3768 100644
--- a/src/common/k8s-api/endpoints/job.api.ts
+++ b/src/common/k8s-api/endpoints/job.api.ts
@@ -5,8 +5,7 @@
 
 import type { DerivedKubeApiOptions, IgnoredKubeApiOptions } from "../kube-api";
 import { KubeApi } from "../kube-api";
-import { metricsApi } from "./metrics.api";
-import type { PodMetricData, PodSpec } from "./pod.api";
+import type { PodSpec } from "./pod.api";
 import type { Container } from "./types/container";
 import type { KubeObjectStatus, LabelSelector, NamespaceScopedMetadata } from "../kube-object";
 import { KubeObject } from "../kube-object";
@@ -103,20 +102,3 @@ export class JobApi extends KubeApi<Job> {
     });
   }
 }
-
-export function getMetricsForJobs(jobs: Job[], namespace: string, selector = ""): Promise<PodMetricData> {
-  const podSelector = jobs.map(job => `${job.getName()}-[[:alnum:]]{5}`).join("|");
-  const opts = { category: "pods", pods: podSelector, namespace, selector };
-
-  return metricsApi.getMetrics({
-    cpuUsage: opts,
-    memoryUsage: opts,
-    fsUsage: opts,
-    fsWrites: opts,
-    fsReads: opts,
-    networkReceive: opts,
-    networkTransmit: opts,
-  }, {
-    namespace,
-  });
-}
diff --git a/src/common/k8s-api/endpoints/lease.api.injectable.ts b/src/common/k8s-api/endpoints/lease.api.injectable.ts
new file mode 100644
index 0000000000..41bd5e3935
--- /dev/null
+++ b/src/common/k8s-api/endpoints/lease.api.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import assert from "assert";
+import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token";
+import { LeaseApi } from "./lease.api";
+import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token";
+
+const leaseApiInjectable = getInjectable({
+  id: "lease-api",
+  instantiate: (di) => {
+    assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "leaseApi is only available in certain environments");
+
+    return new LeaseApi();
+  },
+
+  injectionToken: kubeApiInjectionToken,
+});
+
+export default leaseApiInjectable;
diff --git a/src/common/k8s-api/endpoints/lease.api.ts b/src/common/k8s-api/endpoints/lease.api.ts
new file mode 100644
index 0000000000..22cfb778e4
--- /dev/null
+++ b/src/common/k8s-api/endpoints/lease.api.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { DerivedKubeApiOptions, IgnoredKubeApiOptions } from "../kube-api";
+import { KubeApi } from "../kube-api";
+import type { NamespaceScopedMetadata } from "../kube-object";
+import { KubeObject } from "../kube-object";
+
+export interface LeaseSpec {
+  acquireTime?: string;
+  holderIdentity: string;
+  leaseDurationSeconds: number;
+  leaseTransitions?: number;
+  renewTime: string;
+}
+
+export class Lease extends KubeObject<
+  NamespaceScopedMetadata,
+  void,
+  LeaseSpec
+> {
+  static readonly kind = "Lease";
+  static readonly namespaced = true;
+  static readonly apiBase = "/apis/coordination.k8s.io/v1/leases";
+
+  getAcquireTime(): string {
+    return this.spec.acquireTime || "";
+  }
+
+  getHolderIdentity(): string {
+    return this.spec.holderIdentity;
+  }
+
+  getLeaseDurationSeconds(): number {
+    return this.spec.leaseDurationSeconds;
+  }
+
+  getLeaseTransitions(): number | undefined {
+    return this.spec.leaseTransitions;
+  }
+
+  getRenewTime(): string {
+    return this.spec.renewTime;
+  }
+}
+
+export class LeaseApi extends KubeApi<Lease> {
+  constructor(opts: DerivedKubeApiOptions & IgnoredKubeApiOptions = {}) {
+    super({
+      ...opts,
+      objectConstructor: Lease,
+    });
+  }
+}
diff --git a/src/common/k8s-api/endpoints/metrics.api.ts b/src/common/k8s-api/endpoints/metrics.api.ts
index b5469e8a24..406ab1d0b2 100644
--- a/src/common/k8s-api/endpoints/metrics.api.ts
+++ b/src/common/k8s-api/endpoints/metrics.api.ts
@@ -6,7 +6,7 @@
 // Metrics api
 
 import moment from "moment";
-import { apiBase } from "../index";
+import { isDefined, object } from "../../utils";
 
 export interface MetricData {
   status: string;
@@ -29,63 +29,6 @@ export interface MetricResult {
   values: [number, string][];
 }
 
-export interface MetricProviderInfo {
-  name: string;
-  id: string;
-  isConfigurable: boolean;
-}
-
-export interface IMetricsReqParams {
-  start?: number | string;        // timestamp in seconds or valid date-string
-  end?: number | string;
-  step?: number;                  // step in seconds (default: 60s = each point 1m)
-  range?: number;                 // time-range in seconds for data aggregation (default: 3600s = last 1h)
-  namespace?: string;             // rbac-proxy validation param
-}
-
-export interface IResourceMetrics<T extends MetricData> {
-  [metric: string]: T;
-  cpuUsage: T;
-  memoryUsage: T;
-  fsUsage: T;
-  fsWrites: T;
-  fsReads: T;
-  networkReceive: T;
-  networkTransmit: T;
-}
-
-async function getMetrics(query: string, reqParams?: IMetricsReqParams): Promise<MetricData>;
-async function getMetrics(query: string[], reqParams?: IMetricsReqParams): Promise<MetricData[]>;
-async function getMetrics<MetricNames extends string>(query: Record<MetricNames, Partial<Record<string, string>>>, reqParams?: IMetricsReqParams): Promise<Record<MetricNames, MetricData>>;
-
-async function getMetrics(query: string | string[] | Partial<Record<string, Partial<Record<string, string>>>>, reqParams: IMetricsReqParams = {}): Promise<MetricData | MetricData[] | Partial<Record<string, MetricData>>> {
-  const { range = 3600, step = 60, namespace } = reqParams;
-  let { start, end } = reqParams;
-
-  if (!start && !end) {
-    const timeNow = Date.now() / 1000;
-    const now = moment.unix(timeNow).startOf("minute").unix();  // round date to minutes
-
-    start = now - range;
-    end = now;
-  }
-
-  return apiBase.post("/metrics", {
-    data: query,
-    query: {
-      start, end, step,
-      "kubernetes_namespace": namespace,
-    },
-  });
-}
-
-export const metricsApi = {
-  getMetrics,
-  async getMetricProviders(): Promise<MetricProviderInfo[]> {
-    return apiBase.get("/metrics/providers");
-  },
-};
-
 export function normalizeMetrics(metrics: MetricData | undefined | null, frames = 60): MetricData {
   if (!metrics?.data?.result) {
     return {
@@ -145,7 +88,7 @@ export function isMetricsEmpty(metrics: Partial<Record<string, MetricData>>) {
   return Object.values(metrics).every(metric => !metric?.data?.result?.length);
 }
 
-export function getItemMetrics(metrics: Partial<Record<string, MetricData>> | null | undefined, itemName: string): Partial<Record<string, MetricData>> | undefined {
+export function getItemMetrics<Keys extends string>(metrics: Partial<Record<Keys, MetricData>> | null | undefined, itemName: string): Partial<Record<Keys, MetricData>> | undefined {
   if (!metrics) {
     return undefined;
   }
@@ -166,22 +109,16 @@ export function getItemMetrics(metrics: Partial<Record<string, MetricData>> | nu
   return itemMetrics;
 }
 
-export function getMetricLastPoints<T extends Partial<Record<string, MetricData>>>(metrics: T): Record<keyof T, number> {
-  const result: Partial<{ [metric: string]: number }> = {};
-
-  Object.keys(metrics).forEach(metricName => {
-    try {
-      const metric = metrics[metricName];
-
-      if (metric?.data.result.length) {
-        result[metricName] = +metric.data.result[0].values.slice(-1)[0][1];
-      }
-    } catch {
-      // ignore error
-    }
-
-    return result;
-  }, {});
-
-  return result as Record<keyof T, number>;
+export function getMetricLastPoints<Keys extends string>(metrics: Partial<Record<Keys, MetricData>>): Partial<Record<Keys, number>> {
+  return object.fromEntries(
+    object.entries(metrics)
+      .map(([metricName, metric]) => {
+        try {
+          return [metricName, +metric.data.result[0].values.slice(-1)[0][1]] as const;
+        } catch {
+          return undefined;
+        }
+      })
+      .filter(isDefined),
+  );
 }
diff --git a/src/common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable.ts
new file mode 100644
index 0000000000..84268e3f6a
--- /dev/null
+++ b/src/common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable.ts
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { MetricData } from "../metrics.api";
+import type { RequestMetricsParams } from "./request-metrics.injectable";
+import requestMetricsInjectable from "./request-metrics.injectable";
+
+export interface ClusterMetricData {
+  memoryUsage: MetricData;
+  memoryRequests: MetricData;
+  memoryLimits: MetricData;
+  memoryCapacity: MetricData;
+  memoryAllocatableCapacity: MetricData;
+  cpuUsage: MetricData;
+  cpuRequests: MetricData;
+  cpuLimits: MetricData;
+  cpuCapacity: MetricData;
+  cpuAllocatableCapacity: MetricData;
+  podUsage: MetricData;
+  podCapacity: MetricData;
+  podAllocatableCapacity: MetricData;
+  fsSize: MetricData;
+  fsUsage: MetricData;
+}
+
+export type RequestClusterMetricsByNodeNames = (nodeNames: string[], params?: RequestMetricsParams) => Promise<ClusterMetricData>;
+
+const requestClusterMetricsByNodeNamesInjectable = getInjectable({
+  id: "get-cluster-metrics-by-node-names",
+  instantiate: (di): RequestClusterMetricsByNodeNames => {
+    const requestMetrics = di.inject(requestMetricsInjectable);
+
+    return (nodeNames, params) => {
+      const opts = {
+        category: "cluster",
+        nodes: nodeNames.join("|"),
+      };
+
+      return requestMetrics({
+        memoryUsage: opts,
+        workloadMemoryUsage: opts,
+        memoryRequests: opts,
+        memoryLimits: opts,
+        memoryCapacity: opts,
+        memoryAllocatableCapacity: opts,
+        cpuUsage: opts,
+        cpuRequests: opts,
+        cpuLimits: opts,
+        cpuCapacity: opts,
+        cpuAllocatableCapacity: opts,
+        podUsage: opts,
+        podCapacity: opts,
+        podAllocatableCapacity: opts,
+        fsSize: opts,
+        fsUsage: opts,
+      }, params);
+    };
+  },
+});
+
+export default requestClusterMetricsByNodeNamesInjectable;
diff --git a/src/common/k8s-api/endpoints/metrics.api/request-ingress-metrics.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-ingress-metrics.injectable.ts
new file mode 100644
index 0000000000..8167a6bef4
--- /dev/null
+++ b/src/common/k8s-api/endpoints/metrics.api/request-ingress-metrics.injectable.ts
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { MetricData } from "../metrics.api";
+import requestMetricsInjectable from "./request-metrics.injectable";
+
+export interface IngressMetricData {
+  bytesSentSuccess: MetricData;
+  bytesSentFailure: MetricData;
+  requestDurationSeconds: MetricData;
+  responseDurationSeconds: MetricData;
+}
+
+export type RequestIngressMetrics = (ingress: string, namespace: string) => Promise<IngressMetricData>;
+
+const requestIngressMetricsInjectable = getInjectable({
+  id: "request-ingress-metrics",
+  instantiate: (di): RequestIngressMetrics => {
+    const requestMetrics = di.inject(requestMetricsInjectable);
+
+    return (ingress, namespace) => {
+      const opts = { category: "ingress", ingress, namespace };
+
+      return requestMetrics({
+        bytesSentSuccess: opts,
+        bytesSentFailure: opts,
+        requestDurationSeconds: opts,
+        responseDurationSeconds: opts,
+      }, {
+        namespace,
+      });
+    };
+  },
+});
+
+export default requestIngressMetricsInjectable;
diff --git a/src/common/k8s-api/endpoints/metrics.api/request-metrics-for-all-nodes.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-metrics-for-all-nodes.injectable.ts
new file mode 100644
index 0000000000..6789d6debc
--- /dev/null
+++ b/src/common/k8s-api/endpoints/metrics.api/request-metrics-for-all-nodes.injectable.ts
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { MetricData } from "../metrics.api";
+import requestMetricsInjectable from "./request-metrics.injectable";
+
+export interface NodeMetricData {
+  memoryUsage: MetricData;
+  workloadMemoryUsage: MetricData;
+  memoryCapacity: MetricData;
+  memoryAllocatableCapacity: MetricData;
+  cpuUsage: MetricData;
+  cpuCapacity: MetricData;
+  fsUsage: MetricData;
+  fsSize: MetricData;
+}
+
+export type RequestAllNodeMetrics = () => Promise<NodeMetricData>;
+
+const requestAllNodeMetricsInjectable = getInjectable({
+  id: "request-all-node-metrics",
+  instantiate: (di): RequestAllNodeMetrics => {
+    const requestMetrics = di.inject(requestMetricsInjectable);
+
+    return () => {
+      const opts = { category: "nodes" };
+
+      return requestMetrics({
+        memoryUsage: opts,
+        workloadMemoryUsage: opts,
+        memoryCapacity: opts,
+        memoryAllocatableCapacity: opts,
+        cpuUsage: opts,
+        cpuCapacity: opts,
+        fsSize: opts,
+        fsUsage: opts,
+      });
+    };
+  },
+});
+
+export default requestAllNodeMetricsInjectable;
diff --git a/src/common/k8s-api/endpoints/metrics.api/request-metrics.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-metrics.injectable.ts
new file mode 100644
index 0000000000..0da0bc95ec
--- /dev/null
+++ b/src/common/k8s-api/endpoints/metrics.api/request-metrics.injectable.ts
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { getSecondsFromUnixEpoch } from "../../../utils/date/get-current-date-time";
+import { apiBaseInjectionToken } from "../../api-base";
+import type { MetricData } from "../metrics.api";
+
+
+export interface RequestMetricsParams {
+  /**
+   * timestamp in seconds or valid date-string
+   */
+  start?: number | string;
+
+  /**
+   * timestamp in seconds or valid date-string
+   */
+  end?: number | string;
+
+  /**
+   * step in seconds
+   * @default 60 (1 minute)
+   */
+  step?: number;
+
+  /**
+   * time-range in seconds for data aggregation
+   * @default 3600 (1 hour)
+   */
+  range?: number;
+
+  /**
+   * rbac-proxy validation param
+   */
+  namespace?: string;
+}
+
+export interface RequestMetrics {
+  (query: string, params?: RequestMetricsParams): Promise<MetricData>;
+  (query: string[], params?: RequestMetricsParams): Promise<MetricData[]>;
+  <Keys extends string>(query: Record<Keys, Partial<Record<string, string>>>, params?: RequestMetricsParams): Promise<Record<Keys, MetricData>>;
+}
+
+const requestMetricsInjectable = getInjectable({
+  id: "request-metrics",
+  instantiate: (di) => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return (async (query: object, params: RequestMetricsParams = {}) => {
+      const { range = 3600, step = 60, namespace } = params;
+      let { start, end } = params;
+
+      if (!start && !end) {
+        const now = getSecondsFromUnixEpoch();
+
+        start = now - range;
+        end = now;
+      }
+
+      return apiBase.post("/metrics", {
+        data: query,
+        query: {
+          start, end, step,
+          "kubernetes_namespace": namespace,
+        },
+      });
+    }) as RequestMetrics;
+  },
+});
+
+export default requestMetricsInjectable;
diff --git a/src/common/k8s-api/endpoints/metrics.api/request-persistent-volume-claim-metrics.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-persistent-volume-claim-metrics.injectable.ts
new file mode 100644
index 0000000000..5cafb5ade0
--- /dev/null
+++ b/src/common/k8s-api/endpoints/metrics.api/request-persistent-volume-claim-metrics.injectable.ts
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { MetricData } from "../metrics.api";
+import type { PersistentVolumeClaim } from "../persistent-volume-claim.api";
+import requestMetricsInjectable from "./request-metrics.injectable";
+
+export interface PersistentVolumeClaimMetricData {
+  diskUsage: MetricData;
+  diskCapacity: MetricData;
+}
+
+export type RequestPersistentVolumeClaimMetrics = (claim: PersistentVolumeClaim) => Promise<PersistentVolumeClaimMetricData>;
+
+const requestPersistentVolumeClaimMetricsInjectable = getInjectable({
+  id: "request-persistent-volume-claim-metrics",
+  instantiate: (di): RequestPersistentVolumeClaimMetrics => {
+    const requestMetrics = di.inject(requestMetricsInjectable);
+
+    return (claim) => {
+      const opts = { category: "pvc", pvc: claim.getName(), namespace: claim.getNs() };
+
+      return requestMetrics({
+        diskUsage: opts,
+        diskCapacity: opts,
+      }, {
+        namespace: opts.namespace,
+      });
+    };
+  },
+});
+
+export default requestPersistentVolumeClaimMetricsInjectable;
diff --git a/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-daemon-sets.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-daemon-sets.injectable.ts
new file mode 100644
index 0000000000..d5653574ff
--- /dev/null
+++ b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-daemon-sets.injectable.ts
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { DaemonSet } from "../daemon-set.api";
+import type { MetricData } from "../metrics.api";
+import requestMetricsInjectable from "./request-metrics.injectable";
+
+export interface DaemonSetPodMetricData {
+  cpuUsage: MetricData;
+  memoryUsage: MetricData;
+  fsUsage: MetricData;
+  fsWrites: MetricData;
+  fsReads: MetricData;
+  networkReceive: MetricData;
+  networkTransmit: MetricData;
+}
+
+export type RequestPodMetricsForDaemonSets = (daemonsets: DaemonSet[], namespace: string, selector?: string) => Promise<DaemonSetPodMetricData>;
+
+const requestPodMetricsForDaemonSetsInjectable = getInjectable({
+  id: "request-pod-metrics-for-daemon-sets",
+  instantiate: (di): RequestPodMetricsForDaemonSets => {
+    const requestMetrics = di.inject(requestMetricsInjectable);
+
+    return (daemonSets, namespace, selector = "") => {
+      const podSelector = daemonSets.map(daemonSet => `${daemonSet.getName()}-[[:alnum:]]{5}`).join("|");
+      const opts = { category: "pods", pods: podSelector, namespace, selector };
+
+      return requestMetrics({
+        cpuUsage: opts,
+        memoryUsage: opts,
+        fsUsage: opts,
+        fsWrites: opts,
+        fsReads: opts,
+        networkReceive: opts,
+        networkTransmit: opts,
+      }, {
+        namespace,
+      });
+    };
+  },
+});
+
+export default requestPodMetricsForDaemonSetsInjectable;
diff --git a/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-deployments.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-deployments.injectable.ts
new file mode 100644
index 0000000000..ced8ccd7fe
--- /dev/null
+++ b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-deployments.injectable.ts
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { Deployment } from "../deployment.api";
+import type { MetricData } from "../metrics.api";
+import requestMetricsInjectable from "./request-metrics.injectable";
+
+export interface DeploymentPodMetricData {
+  cpuUsage: MetricData;
+  memoryUsage: MetricData;
+  fsUsage: MetricData;
+  fsWrites: MetricData;
+  fsReads: MetricData;
+  networkReceive: MetricData;
+  networkTransmit: MetricData;
+}
+
+export type RequestPodMetricsForDeployments = (deployments: Deployment[], namespace: string, selector?: string) => Promise<DeploymentPodMetricData>;
+
+const requestPodMetricsForDeploymentsInjectable = getInjectable({
+  id: "request-pod-metrics-for-deployments",
+  instantiate: (di): RequestPodMetricsForDeployments => {
+    const requestMetrics = di.inject(requestMetricsInjectable);
+
+    return (deployments, namespace, selector = "") => {
+      const podSelector = deployments.map(deployment => `${deployment.getName()}-[[:alnum:]]{9,}-[[:alnum:]]{5}`).join("|");
+      const opts = { category: "pods", pods: podSelector, namespace, selector };
+
+      return requestMetrics({
+        cpuUsage: opts,
+        memoryUsage: opts,
+        fsUsage: opts,
+        fsWrites: opts,
+        fsReads: opts,
+        networkReceive: opts,
+        networkTransmit: opts,
+      }, {
+        namespace,
+      });
+    };
+  },
+});
+
+export default requestPodMetricsForDeploymentsInjectable;
diff --git a/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-jobs.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-jobs.injectable.ts
new file mode 100644
index 0000000000..a812fae59c
--- /dev/null
+++ b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-jobs.injectable.ts
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { Job } from "../job.api";
+import type { MetricData } from "../metrics.api";
+import requestMetricsInjectable from "./request-metrics.injectable";
+
+export interface JobPodMetricData {
+  cpuUsage: MetricData;
+  memoryUsage: MetricData;
+  fsUsage: MetricData;
+  fsWrites: MetricData;
+  fsReads: MetricData;
+  networkReceive: MetricData;
+  networkTransmit: MetricData;
+}
+
+export type RequestPodMetricsForJobs = (jobs: Job[], namespace: string, selector?: string) => Promise<JobPodMetricData>;
+
+const requestPodMetricsForJobsInjectable = getInjectable({
+  id: "request-pod-metrics-for-jobs",
+  instantiate: (di): RequestPodMetricsForJobs => {
+    const requestMetrics = di.inject(requestMetricsInjectable);
+
+    return (jobs, namespace, selector) => {
+      const podSelector = jobs.map(job => `${job.getName()}-[[:alnum:]]{5}`).join("|");
+      const opts = { category: "pods", pods: podSelector, namespace, selector };
+
+      return requestMetrics({
+        cpuUsage: opts,
+        memoryUsage: opts,
+        fsUsage: opts,
+        fsWrites: opts,
+        fsReads: opts,
+        networkReceive: opts,
+        networkTransmit: opts,
+      }, {
+        namespace,
+      });
+    };
+  },
+});
+
+export default requestPodMetricsForJobsInjectable;
diff --git a/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-replica-sets.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-replica-sets.injectable.ts
new file mode 100644
index 0000000000..4186cba7b4
--- /dev/null
+++ b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-replica-sets.injectable.ts
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { MetricData } from "../metrics.api";
+import type { ReplicaSet } from "../replica-set.api";
+import requestMetricsInjectable from "./request-metrics.injectable";
+
+export interface ReplicaSetPodMetricData {
+  cpuUsage: MetricData;
+  memoryUsage: MetricData;
+  fsUsage: MetricData;
+  fsWrites: MetricData;
+  fsReads: MetricData;
+  networkReceive: MetricData;
+  networkTransmit: MetricData;
+}
+
+export type RequestPodMetricsForReplicaSets = (replicaSets: ReplicaSet[], namespace: string, selector?: string) => Promise<ReplicaSetPodMetricData>;
+
+const requestPodMetricsForReplicaSetsInjectable = getInjectable({
+  id: "request-pod-metrics-for-replica-sets",
+  instantiate: (di): RequestPodMetricsForReplicaSets => {
+    const requestMetrics = di.inject(requestMetricsInjectable);
+
+    return (replicaSets, namespace, selector = "") => {
+      const podSelector = replicaSets.map(replicaSet => `${replicaSet.getName()}-[[:alnum:]]{5}`).join("|");
+      const opts = { category: "pods", pods: podSelector, namespace, selector };
+
+      return requestMetrics({
+        cpuUsage: opts,
+        memoryUsage: opts,
+        fsUsage: opts,
+        fsWrites: opts,
+        fsReads: opts,
+        networkReceive: opts,
+        networkTransmit: opts,
+      }, {
+        namespace,
+      });
+    };
+  },
+});
+
+export default requestPodMetricsForReplicaSetsInjectable;
diff --git a/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-stateful-sets.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-stateful-sets.injectable.ts
new file mode 100644
index 0000000000..227961bc02
--- /dev/null
+++ b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-stateful-sets.injectable.ts
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { MetricData } from "../metrics.api";
+import type { StatefulSet } from "../stateful-set.api";
+import requestMetricsInjectable from "./request-metrics.injectable";
+
+export interface StatefulSetPodMetricData {
+  cpuUsage: MetricData;
+  memoryUsage: MetricData;
+  fsUsage: MetricData;
+  fsWrites: MetricData;
+  fsReads: MetricData;
+  networkReceive: MetricData;
+  networkTransmit: MetricData;
+}
+
+export type RequestPodMetricsForStatefulSets = (statefulSets: StatefulSet[], namespace: string, selector?: string) => Promise<StatefulSetPodMetricData>;
+
+const requestPodMetricsForStatefulSetsInjectable = getInjectable({
+  id: "request-pod-metrics-for-stateful-sets",
+  instantiate: (di): RequestPodMetricsForStatefulSets => {
+    const requestMetrics = di.inject(requestMetricsInjectable);
+
+    return (statefulSets, namespace, selector = "") => {
+      const podSelector = statefulSets.map(statefulset => `${statefulset.getName()}-[[:digit:]]+`).join("|");
+      const opts = { category: "pods", pods: podSelector, namespace, selector };
+
+      return requestMetrics({
+        cpuUsage: opts,
+        memoryUsage: opts,
+        fsUsage: opts,
+        fsWrites: opts,
+        fsReads: opts,
+        networkReceive: opts,
+        networkTransmit: opts,
+      }, {
+        namespace,
+      });
+    };
+  },
+});
+
+export default requestPodMetricsForStatefulSetsInjectable;
+
diff --git a/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-in-namespace.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-in-namespace.injectable.ts
new file mode 100644
index 0000000000..872ffd740e
--- /dev/null
+++ b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-in-namespace.injectable.ts
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { MetricData } from "../metrics.api";
+import requestMetricsInjectable from "./request-metrics.injectable";
+
+export interface PodMetricInNamespaceData {
+  cpuUsage: MetricData;
+  memoryUsage: MetricData;
+  fsUsage: MetricData;
+  fsWrites: MetricData;
+  fsReads: MetricData;
+  networkReceive: MetricData;
+  networkTransmit: MetricData;
+}
+
+export type RequestPodMetricsInNamespace = (namespace: string, selector?: string) => Promise<PodMetricInNamespaceData>;
+
+const requestPodMetricsInNamespaceInjectable = getInjectable({
+  id: "request-pod-metrics-in-namespace",
+  instantiate: (di): RequestPodMetricsInNamespace => {
+    const requestMetrics = di.inject(requestMetricsInjectable);
+
+    return (namespace, selector) => {
+      const opts = { category: "pods", pods: ".*", namespace, selector };
+
+      return requestMetrics({
+        cpuUsage: opts,
+        memoryUsage: opts,
+        fsUsage: opts,
+        fsWrites: opts,
+        fsReads: opts,
+        networkReceive: opts,
+        networkTransmit: opts,
+      }, {
+        namespace,
+      });
+    };
+  },
+});
+
+export default requestPodMetricsInNamespaceInjectable;
diff --git a/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics.injectable.ts
new file mode 100644
index 0000000000..e14e5dc293
--- /dev/null
+++ b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics.injectable.ts
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { MetricData } from "../metrics.api";
+import type { Pod } from "../pod.api";
+import requestMetricsInjectable from "./request-metrics.injectable";
+
+export interface PodMetricData {
+  cpuUsage: MetricData;
+  memoryUsage: MetricData;
+  fsUsage: MetricData;
+  fsWrites: MetricData;
+  fsReads: MetricData;
+  networkReceive: MetricData;
+  networkTransmit: MetricData;
+  cpuRequests: MetricData;
+  cpuLimits: MetricData;
+  memoryRequests: MetricData;
+  memoryLimits: MetricData;
+}
+
+export type RequestPodMetrics = (pods: Pod[], namespace: string, selector?: string) => Promise<PodMetricData>;
+
+const requestPodMetricsInjectable = getInjectable({
+  id: "request-pod-metrics",
+  instantiate: (di): RequestPodMetrics => {
+    const requestMetrics = di.inject(requestMetricsInjectable);
+
+    return (pods, namespace, selector = "pod, namespace") => {
+      const podSelector = pods.map(pod => pod.getName()).join("|");
+      const opts = { category: "pods", pods: podSelector, namespace, selector };
+
+      return requestMetrics({
+        cpuUsage: opts,
+        cpuRequests: opts,
+        cpuLimits: opts,
+        memoryUsage: opts,
+        memoryRequests: opts,
+        memoryLimits: opts,
+        fsUsage: opts,
+        fsWrites: opts,
+        fsReads: opts,
+        networkReceive: opts,
+        networkTransmit: opts,
+      }, {
+        namespace,
+      });
+    };
+  },
+});
+
+export default requestPodMetricsInjectable;
diff --git a/src/common/k8s-api/endpoints/metrics.api/request-providers.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-providers.injectable.ts
new file mode 100644
index 0000000000..4711333ca6
--- /dev/null
+++ b/src/common/k8s-api/endpoints/metrics.api/request-providers.injectable.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectable } from "@ogre-tools/injectable";
+import { apiBaseInjectionToken } from "../../api-base";
+
+export interface MetricProviderInfo {
+  name: string;
+  id: string;
+  isConfigurable: boolean;
+}
+
+export type RequestMetricsProviders = () => Promise<MetricProviderInfo[]>;
+
+const requestMetricsProvidersInjectable = getInjectable({
+  id: "request-metrics-providers",
+  instantiate: (di): RequestMetricsProviders => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return () => apiBase.get("/metrics/providers");
+  },
+});
+
+export default requestMetricsProvidersInjectable;
diff --git a/src/common/k8s-api/endpoints/namespace.api.ts b/src/common/k8s-api/endpoints/namespace.api.ts
index 6a2c7e2a95..774d91cf61 100644
--- a/src/common/k8s-api/endpoints/namespace.api.ts
+++ b/src/common/k8s-api/endpoints/namespace.api.ts
@@ -7,8 +7,6 @@ import type { DerivedKubeApiOptions, IgnoredKubeApiOptions } from "../kube-api";
 import { KubeApi } from "../kube-api";
 import type { ClusterScopedMetadata, KubeObjectStatus } from "../kube-object";
 import { KubeObject } from "../kube-object";
-import { metricsApi } from "./metrics.api";
-import type { PodMetricData } from "./pod.api";
 
 export enum NamespaceStatusKind {
   ACTIVE = "Active",
@@ -45,19 +43,3 @@ export class NamespaceApi extends KubeApi<Namespace> {
     });
   }
 }
-
-export function getMetricsForNamespace(namespace: string, selector = ""): Promise<PodMetricData> {
-  const opts = { category: "pods", pods: ".*", namespace, selector };
-
-  return metricsApi.getMetrics({
-    cpuUsage: opts,
-    memoryUsage: opts,
-    fsUsage: opts,
-    fsWrites: opts,
-    fsReads: opts,
-    networkReceive: opts,
-    networkTransmit: opts,
-  }, {
-    namespace,
-  });
-}
diff --git a/src/common/k8s-api/endpoints/node.api.ts b/src/common/k8s-api/endpoints/node.api.ts
index 15da73311b..e1d726bed1 100644
--- a/src/common/k8s-api/endpoints/node.api.ts
+++ b/src/common/k8s-api/endpoints/node.api.ts
@@ -6,8 +6,6 @@
 import type { BaseKubeObjectCondition, ClusterScopedMetadata } from "../kube-object";
 import { KubeObject } from "../kube-object";
 import { cpuUnitsToNumber, unitsToBytes, isObject } from "../../../renderer/utils";
-import type { MetricData } from "./metrics.api";
-import { metricsApi } from "./metrics.api";
 import type { DerivedKubeApiOptions, IgnoredKubeApiOptions } from "../kube-api";
 import { KubeApi } from "../kube-api";
 import { TypedRegEx } from "typed-regex";
@@ -21,32 +19,6 @@ export class NodeApi extends KubeApi<Node> {
   }
 }
 
-export function getMetricsForAllNodes(): Promise<NodeMetricData> {
-  const opts = { category: "nodes" };
-
-  return metricsApi.getMetrics({
-    memoryUsage: opts,
-    workloadMemoryUsage: opts,
-    memoryCapacity: opts,
-    memoryAllocatableCapacity: opts,
-    cpuUsage: opts,
-    cpuCapacity: opts,
-    fsSize: opts,
-    fsUsage: opts,
-  });
-}
-
-export interface NodeMetricData extends Partial<Record<string, MetricData>> {
-  memoryUsage: MetricData;
-  workloadMemoryUsage: MetricData;
-  memoryCapacity: MetricData;
-  memoryAllocatableCapacity: MetricData;
-  cpuUsage: MetricData;
-  cpuCapacity: MetricData;
-  fsUsage: MetricData;
-  fsSize: MetricData;
-}
-
 export interface NodeTaint {
   key: string;
   value?: string;
diff --git a/src/common/k8s-api/endpoints/persistent-volume-claim.api.ts b/src/common/k8s-api/endpoints/persistent-volume-claim.api.ts
index 733a9768c5..4c3c575699 100644
--- a/src/common/k8s-api/endpoints/persistent-volume-claim.api.ts
+++ b/src/common/k8s-api/endpoints/persistent-volume-claim.api.ts
@@ -5,8 +5,6 @@
 
 import type { LabelSelector, NamespaceScopedMetadata, TypedLocalObjectReference } from "../kube-object";
 import { KubeObject } from "../kube-object";
-import type { MetricData } from "./metrics.api";
-import { metricsApi } from "./metrics.api";
 import type { Pod } from "./pod.api";
 import type { DerivedKubeApiOptions, IgnoredKubeApiOptions } from "../kube-api";
 import { KubeApi } from "../kube-api";
@@ -22,22 +20,6 @@ export class PersistentVolumeClaimApi extends KubeApi<PersistentVolumeClaim> {
   }
 }
 
-export function getMetricsForPvc(pvc: PersistentVolumeClaim): Promise<PersistentVolumeClaimMetricData> {
-  const opts = { category: "pvc", pvc: pvc.getName(), namespace: pvc.getNs() };
-
-  return metricsApi.getMetrics({
-    diskUsage: opts,
-    diskCapacity: opts,
-  }, {
-    namespace: opts.namespace,
-  });
-}
-
-export interface PersistentVolumeClaimMetricData extends Partial<Record<string, MetricData>> {
-  diskUsage: MetricData;
-  diskCapacity: MetricData;
-}
-
 export interface PersistentVolumeClaimSpec {
   accessModes?: string[];
   dataSource?: TypedLocalObjectReference;
diff --git a/src/common/k8s-api/endpoints/pod.api.ts b/src/common/k8s-api/endpoints/pod.api.ts
index 5822c0c5ef..862a28da94 100644
--- a/src/common/k8s-api/endpoints/pod.api.ts
+++ b/src/common/k8s-api/endpoints/pod.api.ts
@@ -3,8 +3,6 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { MetricData } from "./metrics.api";
-import { metricsApi } from "./metrics.api";
 import type { DerivedKubeApiOptions, IgnoredKubeApiOptions, ResourceDescriptor } from "../kube-api";
 import { KubeApi } from "../kube-api";
 import type { RequireExactlyOne } from "type-fest";
@@ -33,41 +31,6 @@ export class PodApi extends KubeApi<Pod> {
   }
 }
 
-export function getMetricsForPods(pods: Pod[], namespace: string, selector = "pod, namespace"): Promise<PodMetricData> {
-  const podSelector = pods.map(pod => pod.getName()).join("|");
-  const opts = { category: "pods", pods: podSelector, namespace, selector };
-
-  return metricsApi.getMetrics({
-    cpuUsage: opts,
-    cpuRequests: opts,
-    cpuLimits: opts,
-    memoryUsage: opts,
-    memoryRequests: opts,
-    memoryLimits: opts,
-    fsUsage: opts,
-    fsWrites: opts,
-    fsReads: opts,
-    networkReceive: opts,
-    networkTransmit: opts,
-  }, {
-    namespace,
-  });
-}
-
-export interface PodMetricData extends Partial<Record<string, MetricData>> {
-  cpuUsage: MetricData;
-  memoryUsage: MetricData;
-  fsUsage: MetricData;
-  fsWrites: MetricData;
-  fsReads: MetricData;
-  networkReceive: MetricData;
-  networkTransmit: MetricData;
-  cpuRequests?: MetricData;
-  cpuLimits?: MetricData;
-  memoryRequests?: MetricData;
-  memoryLimits?: MetricData;
-}
-
 // Reference: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#read-log-pod-v1-core
 export interface PodLogsQuery {
   container?: string;
@@ -714,6 +677,10 @@ export class Pod extends KubeObject<
     return this.spec?.priorityClassName || "";
   }
 
+  getRuntimeClassName() {
+    return this.spec?.runtimeClassName || "";
+  }
+
   getServiceAccountName() {
     return this.spec?.serviceAccountName || "";
   }
diff --git a/src/common/k8s-api/endpoints/replica-set.api.ts b/src/common/k8s-api/endpoints/replica-set.api.ts
index ea3cdc25b9..401ba6cf05 100644
--- a/src/common/k8s-api/endpoints/replica-set.api.ts
+++ b/src/common/k8s-api/endpoints/replica-set.api.ts
@@ -5,8 +5,6 @@
 
 import type { DerivedKubeApiOptions, IgnoredKubeApiOptions } from "../kube-api";
 import { KubeApi } from "../kube-api";
-import { metricsApi } from "./metrics.api";
-import type { PodMetricData } from "./pod.api";
 import type { KubeObjectStatus, LabelSelector, NamespaceScopedMetadata } from "../kube-object";
 import { KubeObject } from "../kube-object";
 import type { PodTemplateSpec } from "./types/pod-template-spec";
@@ -41,23 +39,6 @@ export class ReplicaSetApi extends KubeApi<ReplicaSet> {
   }
 }
 
-export function getMetricsForReplicaSets(replicasets: ReplicaSet[], namespace: string, selector = ""): Promise<PodMetricData> {
-  const podSelector = replicasets.map(replicaset => `${replicaset.getName()}-[[:alnum:]]{5}`).join("|");
-  const opts = { category: "pods", pods: podSelector, namespace, selector };
-
-  return metricsApi.getMetrics({
-    cpuUsage: opts,
-    memoryUsage: opts,
-    fsUsage: opts,
-    fsWrites: opts,
-    fsReads: opts,
-    networkReceive: opts,
-    networkTransmit: opts,
-  }, {
-    namespace,
-  });
-}
-
 export interface ReplicaSetSpec {
   replicas?: number;
   selector: LabelSelector;
diff --git a/src/common/k8s-api/endpoints/resource-applier.api.ts b/src/common/k8s-api/endpoints/resource-applier.api.ts
deleted file mode 100644
index 9f0c3bb6cd..0000000000
--- a/src/common/k8s-api/endpoints/resource-applier.api.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import yaml from "js-yaml";
-import type { KubeJsonApiData } from "../kube-json-api";
-import { apiBase } from "../index";
-import type { Patch } from "rfc6902";
-
-export const annotations = [
-  "kubectl.kubernetes.io/last-applied-configuration",
-];
-
-export async function update(resource: object | string): Promise<KubeJsonApiData> {
-  if (typeof resource === "string") {
-    const parsed = yaml.load(resource);
-
-    if (!parsed || typeof parsed !== "object") {
-      throw new Error("Cannot update resource to string or number");
-    }
-
-    resource = parsed;
-  }
-
-  return apiBase.post<KubeJsonApiData>("/stack", { data: resource });
-}
-
-export async function patch(name: string, kind: string, ns: string | undefined, patch: Patch): Promise<KubeJsonApiData> {
-  return apiBase.patch<KubeJsonApiData>("/stack", {
-    data: {
-      name,
-      kind,
-      ns,
-      patch,
-    },
-  });
-}
diff --git a/src/common/k8s-api/endpoints/resource-applier.api/request-patch.injectable.ts b/src/common/k8s-api/endpoints/resource-applier.api/request-patch.injectable.ts
new file mode 100644
index 0000000000..c8ad3435fd
--- /dev/null
+++ b/src/common/k8s-api/endpoints/resource-applier.api/request-patch.injectable.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { Patch } from "rfc6902";
+import { apiBaseInjectionToken } from "../../api-base";
+import type { KubeJsonApiData } from "../../kube-json-api";
+
+export type RequestKubeObjectPatch = (name: string, kind: string, ns: string | undefined, patch: Patch) => Promise<KubeJsonApiData>;
+
+const requestKubeObjectPatchInjectable = getInjectable({
+  id: "request-kube-object-patch",
+  instantiate: (di): RequestKubeObjectPatch => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return (name, kind, ns, patch) => (
+      apiBase.patch("/stack", {
+        data: {
+          name,
+          kind,
+          ns,
+          patch,
+        },
+      })
+    );
+  },
+});
+
+export default requestKubeObjectPatchInjectable;
diff --git a/src/common/k8s-api/endpoints/resource-applier.api/request-update.injectable.ts b/src/common/k8s-api/endpoints/resource-applier.api/request-update.injectable.ts
new file mode 100644
index 0000000000..52824cd86c
--- /dev/null
+++ b/src/common/k8s-api/endpoints/resource-applier.api/request-update.injectable.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { apiBaseInjectionToken } from "../../api-base";
+import type { KubeJsonApiData } from "../../kube-json-api";
+
+export type RequestKubeObjectCreation = (resourceDescriptor: string) => Promise<KubeJsonApiData>;
+
+const requestKubeObjectCreationInjectable = getInjectable({
+  id: "request-kube-object-creation",
+  instantiate: (di): RequestKubeObjectCreation => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+
+    return (data) => apiBase.post("/stack", { data });
+  },
+});
+
+export default requestKubeObjectCreationInjectable;
diff --git a/src/common/k8s-api/endpoints/runtime-class.api.injectable.ts b/src/common/k8s-api/endpoints/runtime-class.api.injectable.ts
new file mode 100644
index 0000000000..1b13d13270
--- /dev/null
+++ b/src/common/k8s-api/endpoints/runtime-class.api.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import assert from "assert";
+import { storesAndApisCanBeCreatedInjectionToken } from "../stores-apis-can-be-created.token";
+import { RuntimeClassApi } from "./runtime-class.api";
+import { kubeApiInjectionToken } from "../kube-api/kube-api-injection-token";
+
+const runtimeClassApiInjectable = getInjectable({
+  id: "runtime-class-api",
+  instantiate: (di) => {
+    assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "RuntimeClassApi is only available in certain environments");
+
+    return new RuntimeClassApi();
+  },
+
+  injectionToken: kubeApiInjectionToken,
+});
+
+export default runtimeClassApiInjectable;
diff --git a/src/common/k8s-api/endpoints/runtime-class.api.ts b/src/common/k8s-api/endpoints/runtime-class.api.ts
new file mode 100644
index 0000000000..fa1867ea07
--- /dev/null
+++ b/src/common/k8s-api/endpoints/runtime-class.api.ts
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { DerivedKubeApiOptions } from "../kube-api";
+import { KubeApi } from "../kube-api";
+import type { KubeJsonApiData } from "../kube-json-api";
+import type { ClusterScopedMetadata, KubeObjectMetadata, KubeObjectScope, Toleration } from "../kube-object";
+import { KubeObject } from "../kube-object";
+
+export interface RuntimeClassData extends KubeJsonApiData<KubeObjectMetadata<KubeObjectScope.Cluster>, void, void> {
+  handler: string;
+  overhead?: RuntimeClassOverhead;
+  scheduling?: RuntimeClassScheduling;
+}
+
+export interface RuntimeClassOverhead {
+  podFixed?: string;
+}
+
+export interface RuntimeClassScheduling {
+  nodeSelector?: Partial<Record<string, string>>;
+  tolerations?: Toleration[];
+}
+
+export class RuntimeClass extends KubeObject<
+  ClusterScopedMetadata,
+  void,
+  void
+> {
+  static readonly kind = "RuntimeClass";
+  static readonly namespaced = false;
+  static readonly apiBase = "/apis/node.k8s.io/v1/runtimeclasses";
+
+  handler: string;
+  overhead?: RuntimeClassOverhead;
+  scheduling?: RuntimeClassScheduling;
+
+  constructor({ handler, overhead, scheduling, ...rest }: RuntimeClassData) {
+    super(rest);
+    this.handler = handler;
+    this.overhead = overhead;
+    this.scheduling = scheduling;
+  }
+
+  getHandler() {
+    return this.handler;
+  }
+
+  getPodFixed() {
+    return this.overhead?.podFixed ?? "";
+  }
+
+  getNodeSelectors(): string[] {
+    return Object.entries(this.scheduling?.nodeSelector ?? {})
+      .map(values => values.join(": "));
+  }
+
+  getTolerations() {
+    return this.scheduling?.tolerations ?? [];
+  }
+}
+
+export class RuntimeClassApi extends KubeApi<RuntimeClass, RuntimeClassData> {
+  constructor(opts: DerivedKubeApiOptions = {}) {
+    super({
+      objectConstructor: RuntimeClass,
+      ...opts,
+    });
+  }
+}
diff --git a/src/common/k8s-api/endpoints/stateful-set.api.ts b/src/common/k8s-api/endpoints/stateful-set.api.ts
index f6e36c36fb..1d6895f934 100644
--- a/src/common/k8s-api/endpoints/stateful-set.api.ts
+++ b/src/common/k8s-api/endpoints/stateful-set.api.ts
@@ -5,8 +5,6 @@
 
 import type { DerivedKubeApiOptions, IgnoredKubeApiOptions } from "../kube-api";
 import { KubeApi } from "../kube-api";
-import { metricsApi } from "./metrics.api";
-import type { PodMetricData } from "./pod.api";
 import type { LabelSelector, NamespaceScopedMetadata } from "../kube-object";
 import { KubeObject } from "../kube-object";
 import type { PodTemplateSpec } from "./types/pod-template-spec";
@@ -46,23 +44,6 @@ export class StatefulSetApi extends KubeApi<StatefulSet> {
   }
 }
 
-export function getMetricsForStatefulSets(statefulSets: StatefulSet[], namespace: string, selector = ""): Promise<PodMetricData> {
-  const podSelector = statefulSets.map(statefulset => `${statefulset.getName()}-[[:digit:]]+`).join("|");
-  const opts = { category: "pods", pods: podSelector, namespace, selector };
-
-  return metricsApi.getMetrics({
-    cpuUsage: opts,
-    memoryUsage: opts,
-    fsUsage: opts,
-    fsWrites: opts,
-    fsReads: opts,
-    networkReceive: opts,
-    networkTransmit: opts,
-  }, {
-    namespace,
-  });
-}
-
 export interface StatefulSetSpec {
   serviceName: string;
   replicas: number;
diff --git a/src/common/k8s-api/json-api.ts b/src/common/k8s-api/json-api.ts
index 36b4fdd9f5..c3e07bfa94 100644
--- a/src/common/k8s-api/json-api.ts
+++ b/src/common/k8s-api/json-api.ts
@@ -9,12 +9,12 @@ import { Agent as HttpAgent } from "http";
 import { Agent as HttpsAgent } from "https";
 import { merge } from "lodash";
 import type { Response, RequestInit } from "node-fetch";
-import fetch from "node-fetch";
 import { stringify } from "querystring";
 import type { Patch } from "rfc6902";
 import type { PartialDeep, ValueOf } from "type-fest";
 import { EventEmitter } from "../../common/event-emitter";
-import logger from "../../common/logger";
+import type { Logger } from "../../common/logger";
+import type { Fetch } from "../fetch/fetch.injectable";
 import type { Defaulted } from "../utils";
 import { json } from "../utils";
 
@@ -59,6 +59,11 @@ export type ParamsAndQuery<Params, Query> = (
     : Params & { query?: undefined }
 );
 
+export interface JsonApiDependencies {
+  fetch: Fetch;
+  readonly logger: Logger;
+}
+
 export class JsonApi<Data = JsonApiData, Params extends JsonApiParams<Data> = JsonApiParams<Data>> {
   static readonly reqInitDefault = {
     headers: {
@@ -71,7 +76,7 @@ export class JsonApi<Data = JsonApiData, Params extends JsonApiParams<Data> = Js
     debug: false,
   };
 
-  constructor(public readonly config: JsonApiConfig, reqInit?: RequestInit) {
+  constructor(protected readonly dependencies: JsonApiDependencies, public readonly config: JsonApiConfig, reqInit?: RequestInit) {
     this.config = Object.assign({}, JsonApi.configDefault, config);
     this.reqInit = merge({}, JsonApi.reqInitDefault, reqInit);
     this.parseResponse = this.parseResponse.bind(this);
@@ -105,7 +110,7 @@ export class JsonApi<Data = JsonApiData, Params extends JsonApiParams<Data> = Js
       reqUrl += (reqUrl.includes("?") ? "&" : "?") + queryString;
     }
 
-    return fetch(reqUrl, reqInit);
+    return this.dependencies.fetch(reqUrl, reqInit);
   }
 
   get<OutData = Data, Query = QueryParams>(
@@ -177,7 +182,7 @@ export class JsonApi<Data = JsonApiData, Params extends JsonApiParams<Data> = Js
       reqInit,
     };
 
-    const res = await fetch(reqUrl, reqInit);
+    const res = await this.dependencies.fetch(reqUrl, reqInit);
 
     return this.parseResponse<OutData>(res, infoLog);
   }
@@ -233,7 +238,7 @@ export class JsonApi<Data = JsonApiData, Params extends JsonApiParams<Data> = Js
   protected writeLog(log: JsonApiLog) {
     const { method, reqUrl, ...params } = log;
 
-    logger.debug(`[JSON-API] request ${method} ${reqUrl}`, params);
+    this.dependencies.logger.debug(`[JSON-API] request ${method} ${reqUrl}`, params);
   }
 }
 
diff --git a/src/common/k8s-api/kube-api-parse.ts b/src/common/k8s-api/kube-api-parse.ts
index 509f1c28e9..dcb8b18636 100644
--- a/src/common/k8s-api/kube-api-parse.ts
+++ b/src/common/k8s-api/kube-api-parse.ts
@@ -17,6 +17,7 @@ export interface IKubeApiLinkRef {
 
 export interface IKubeApiParsed extends IKubeApiLinkRef {
   apiBase: string;
+  apiPrefix: string;
   apiGroup: string;
   apiVersionWithGroup: string;
 }
diff --git a/src/common/k8s-api/kube-api.ts b/src/common/k8s-api/kube-api.ts
index ddc2456668..7ca2995906 100644
--- a/src/common/k8s-api/kube-api.ts
+++ b/src/common/k8s-api/kube-api.ts
@@ -5,29 +5,28 @@
 
 // Base class for building all kubernetes apis
 
-import { isFunction, merge } from "lodash";
+import { merge } from "lodash";
 import { stringify } from "querystring";
-import { apiKubePrefix, isDevelopment } from "../../common/vars";
-import { apiBase, apiKube } from "./index";
 import { createKubeApiURL, parseKubeApi } from "./kube-api-parse";
 import type { KubeObjectConstructor, KubeJsonApiDataFor, KubeObjectMetadata } from "./kube-object";
 import { KubeObject, KubeStatus, isKubeStatusData } from "./kube-object";
 import byline from "byline";
 import type { IKubeWatchEvent } from "./kube-watch-event";
-import type { KubeJsonApiData } from "./kube-json-api";
-import { KubeJsonApi } from "./kube-json-api";
+import type { KubeJsonApiData, KubeJsonApi } from "./kube-json-api";
 import type { Disposer } from "../utils";
 import { isDefined, noop, WrappedAbortController } from "../utils";
-import type { RequestInit } from "node-fetch";
-import type { AgentOptions } from "https";
-import { Agent } from "https";
+import type { RequestInit, Response } from "node-fetch";
 import type { Patch } from "rfc6902";
 import assert from "assert";
 import type { PartialDeep } from "type-fest";
-import logger from "../logger";
+import type { Logger } from "../logger";
 import { Environments, getEnvironmentSpecificLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import autoRegistrationEmitterInjectable from "./api-manager/auto-registration-emitter.injectable";
+import { asLegacyGlobalForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
+import { apiKubeInjectionToken } from "./api-kube";
 import type AbortController from "abort-controller";
+import loggerInjectable from "../logger.injectable";
+import { matches } from "lodash/fp";
 
 /**
  * The options used for creating a `KubeApi`
@@ -145,146 +144,59 @@ export interface KubeApiResourceList {
   resources: KubeApiResource[];
 }
 
-export interface ILocalKubeApiConfig {
-  metadata: {
-    uid: string;
-  };
+export interface KubeApiResourceVersion {
+  groupVersion: string;
+  version: string;
 }
 
+export interface KubeApiResourceVersionList {
+  apiVersion: string;
+  kind: string;
+  name: string;
+  preferredVersion: KubeApiResourceVersion;
+  versions: KubeApiResourceVersion[];
+}
+
+const not = <T>(fn: (val: T) => boolean) => (val: T) => !(fn(val));
+
+const getOrderedVersions = (list: KubeApiResourceVersionList): KubeApiResourceVersion[] => [
+  list.preferredVersion,
+  ...list.versions.filter(not(matches(list.preferredVersion))),
+];
+
 export type PropagationPolicy = undefined | "Orphan" | "Foreground" | "Background";
 
-/**
- * @deprecated
- */
-export interface IKubeApiCluster extends ILocalKubeApiConfig { }
-
-export interface IRemoteKubeApiConfig {
-  cluster: {
-    server: string;
-    caData?: string;
-    skipTLSVerify?: boolean;
-  };
-  user: {
-    token?: string | (() => Promise<string>);
-    clientCertificateData?: string;
-    clientKeyData?: string;
-  };
-  /**
-   * Custom instance of https.agent to use for the requests
-   *
-   * @remarks the custom agent replaced default agent, options skipTLSVerify,
-   * clientCertificateData, clientKeyData and caData are ignored.
-   */
-   agent?: Agent;
-}
-
-export function forCluster<
-  Object extends KubeObject,
-  Api extends KubeApi<Object>,
-  Data extends KubeJsonApiDataFor<Object>,
->(cluster: ILocalKubeApiConfig, kubeClass: KubeObjectConstructor<Object, Data>, apiClass: new (apiOpts: KubeApiOptions<Object>) => Api): Api;
-export function forCluster<
-  Object extends KubeObject,
-  Data extends KubeJsonApiDataFor<Object>,
->(cluster: ILocalKubeApiConfig, kubeClass: KubeObjectConstructor<Object, Data>, apiClass?: new (apiOpts: KubeApiOptions<Object>) => KubeApi<Object>): KubeApi<Object>;
-
-export function forCluster<
-  Object extends KubeObject,
-  Data extends KubeJsonApiDataFor<Object>,
->(cluster: ILocalKubeApiConfig, kubeClass: KubeObjectConstructor<Object, Data>, apiClass: (new (apiOpts: KubeApiOptions<Object>) => KubeApi<Object>) = KubeApi): KubeApi<Object> {
-  const url = new URL(apiBase.config.serverAddress);
-  const request = new KubeJsonApi({
-    serverAddress: apiBase.config.serverAddress,
-    apiBase: apiKubePrefix,
-    debug: isDevelopment,
-  }, {
-    headers: {
-      "Host": `${cluster.metadata.uid}.localhost:${url.port}`,
-    },
-  });
-
-  return new apiClass({
-    objectConstructor: kubeClass as KubeObjectConstructor<Object, KubeJsonApiDataFor<Object>>,
-    request,
-  });
-}
-
-export function forRemoteCluster<
-  Object extends KubeObject,
-  Api extends KubeApi<Object>,
-  Data extends KubeJsonApiDataFor<Object>,
->(config: IRemoteKubeApiConfig, kubeClass: KubeObjectConstructor<Object, Data>, apiClass: new (apiOpts: KubeApiOptions<Object>) => Api): Api;
-export function forRemoteCluster<
-  Object extends KubeObject,
-  Data extends KubeJsonApiDataFor<Object>,
->(config: IRemoteKubeApiConfig, kubeClass: KubeObjectConstructor<Object, Data>, apiClass?: new (apiOpts: KubeApiOptions<Object>) => KubeApi<Object>): KubeApi<Object>;
-
-export function forRemoteCluster<
-  Object extends KubeObject,
-  Api extends KubeApi<Object>,
-  Data extends KubeJsonApiDataFor<Object>,
->(config: IRemoteKubeApiConfig, kubeClass: KubeObjectConstructor<Object, Data>, apiClass: new (apiOpts: KubeApiOptions<Object>) => KubeApi<Object> = KubeApi): KubeApi<Object> {
-  const reqInit: RequestInit = {};
-  const agentOptions: AgentOptions = {};
-
-  if (config.cluster.skipTLSVerify === true) {
-    agentOptions.rejectUnauthorized = false;
-  }
-
-  if (config.user.clientCertificateData) {
-    agentOptions.cert = config.user.clientCertificateData;
-  }
-
-  if (config.user.clientKeyData) {
-    agentOptions.key = config.user.clientKeyData;
-  }
-
-  if (config.cluster.caData) {
-    agentOptions.ca = config.cluster.caData;
-  }
-
-  if (Object.keys(agentOptions).length > 0) {
-    reqInit.agent = new Agent(agentOptions);
-  }
-
-  if (config.agent) {
-    reqInit.agent = config.agent;
-  }
-
-  const token = config.user.token;
-  const request = new KubeJsonApi({
-    serverAddress: config.cluster.server,
-    apiBase: "",
-    debug: isDevelopment,
-    ...(token ? {
-      getRequestOptions: async () => ({
-        headers: {
-          "Authorization": `Bearer ${isFunction(token) ? await token() : token}`,
-        },
-      }),
-    } : {}),
-  }, reqInit);
-
-  if (!apiClass) {
-    apiClass = KubeApi as new (apiOpts: KubeApiOptions<Object>) => Api;
-  }
-
-  return new apiClass({
-    objectConstructor: kubeClass as KubeObjectConstructor<Object, KubeJsonApiDataFor<Object>>,
-    request,
-  });
-}
-
-export type KubeApiWatchCallback<T extends KubeJsonApiData = KubeJsonApiData> = (data: IKubeWatchEvent<T>, error: any) => void;
+export type KubeApiWatchCallback<T extends KubeJsonApiData = KubeJsonApiData> = (data: IKubeWatchEvent<T> | null, error: KubeStatus | Response | null | any) => void;
 
 export interface KubeApiWatchOptions<Object extends KubeObject, Data extends KubeJsonApiDataFor<Object>> {
-  namespace: string;
+  /**
+   * If the resource is namespaced then the default is `"default"`
+   */
+  namespace?: string;
+
+  /**
+   * This will be called when either an error occurs or some data is received
+   */
   callback?: KubeApiWatchCallback<Data>;
+
+  /**
+   * This is a way of aborting the request
+   */
   abortController?: AbortController;
+
+  /**
+   * The ID used for tracking within logs
+   */
   watchId?: string;
+
+  /**
+   * @default false
+   */
   retry?: boolean;
 
-  // timeout in seconds
+  /**
+   * timeout in seconds
+   */
   timeout?: number;
 }
 
@@ -343,6 +255,10 @@ function legacyRegisterApi(api: KubeApi<any, any>): void {
   }
 }
 
+export interface KubeApiDependencies {
+  readonly logger: Logger;
+}
+
 export class KubeApi<
   Object extends KubeObject = KubeObject,
   Data extends KubeJsonApiDataFor<Object> = KubeJsonApiDataFor<Object>,
@@ -365,10 +281,12 @@ export class KubeApi<
   protected readonly fullApiPathname: string;
   protected readonly fallbackApiBases: string[] | undefined;
 
+  protected readonly dependencies: KubeApiDependencies;
+
   constructor(opts: KubeApiOptions<Object, Data>) {
     const {
       objectConstructor,
-      request = apiKube,
+      request = asLegacyGlobalForExtensionApi(apiKubeInjectionToken),
       kind = objectConstructor.kind,
       isNamespaced,
       apiBase: fullApiPathname = objectConstructor.apiBase,
@@ -397,6 +315,10 @@ export class KubeApi<
     this.request = request;
     this.objectConstructor = objectConstructor;
     legacyRegisterApi(this);
+
+    this.dependencies = {
+      logger: asLegacyGlobalForExtensionApi(loggerInjectable),
+    };
   }
 
   get apiVersionWithGroup() {
@@ -411,23 +333,29 @@ export class KubeApi<
    */
   private async getLatestApiPrefixGroup() {
     // Note that this.fullApiPathname is the "full" url, whereas this.apiBase is parsed
-    const apiBases = [this.fullApiPathname, this.objectConstructor.apiBase, ...this.fallbackApiBases ?? []];
+    const rawApiBases = [
+      this.fullApiPathname,
+      this.objectConstructor.apiBase,
+      ...this.fallbackApiBases ?? [],
+    ].filter(isDefined);
+    const apiBases = new Set(rawApiBases);
 
     for (const apiUrl of apiBases) {
-      if (!apiUrl) {
-        continue;
-      }
-
       try {
-        // Split e.g. "/apis/extensions/v1beta1/ingresses" to parts
-        const { apiPrefix, apiGroup, apiVersionWithGroup, resource } = parseKubeApi(apiUrl);
+        const { apiPrefix, apiGroup, resource } = parseKubeApi(apiUrl);
+        const list = await this.request.get(`${apiPrefix}/${apiGroup}`) as KubeApiResourceVersionList;
+        const resourceVersions = getOrderedVersions(list);
 
-        // Request available resources
-        const { resources } = (await this.request.get(`${apiPrefix}/${apiVersionWithGroup}`)) as unknown as KubeApiResourceList;
+        for (const resourceVersion of resourceVersions) {
+          const { resources } = await this.request.get(`${apiPrefix}/${resourceVersion.groupVersion}`) as KubeApiResourceList;
 
-        // If the resource is found in the group, use this apiUrl
-        if (resources.find(({ name }) => name === resource)) {
-          return { apiPrefix, apiGroup };
+          if (resources.some(({ name }) => name === resource)) {
+            return {
+              apiPrefix,
+              apiGroup,
+              apiVersionPreferred: resourceVersion.version,
+            };
+          }
         }
       } catch (error) {
         // Exception is ignored as we can try the next url
@@ -437,48 +365,19 @@ export class KubeApi<
     throw new Error(`Can't find working API for the Kubernetes resource ${this.apiResource}`);
   }
 
-  /**
-   * Get the apiPrefix and apiGroup to be used for fetching the preferred version.
-   */
-  private async getPreferredVersionPrefixGroup() {
-    if (this.fallbackApiBases) {
-      try {
-        return await this.getLatestApiPrefixGroup();
-      } catch (error) {
-        // If valid API wasn't found, log the error and return defaults below
-        logger.error(`[KUBE-API]: ${error}`);
-      }
-    }
-
-    return {
-      apiPrefix: this.apiPrefix,
-      apiGroup: this.apiGroup,
-    };
-  }
-
   protected async checkPreferredVersion() {
     if (this.fallbackApiBases && !this.doCheckPreferredVersion) {
       throw new Error("checkPreferredVersion must be enabled if fallbackApiBases is set in KubeApi");
     }
 
     if (this.doCheckPreferredVersion && this.apiVersionPreferred === undefined) {
-      const { apiPrefix, apiGroup } = await this.getPreferredVersionPrefixGroup();
+      const { apiPrefix, apiGroup, apiVersionPreferred } = await this.getLatestApiPrefixGroup();
 
-      assert(apiPrefix);
-
-      // The apiPrefix and apiGroup might change due to fallbackApiBases, so we must override them
       this.apiPrefix = apiPrefix;
       this.apiGroup = apiGroup;
-
-      const url = [apiPrefix, apiGroup].filter(Boolean).join("/");
-      const res = await this.request.get(url) as IKubePreferredVersion;
-
-      this.apiVersionPreferred = res?.preferredVersion?.version;
-
-      if (this.apiVersionPreferred) {
-        this.apiBase = this.computeApiBase();
-        legacyRegisterApi(this);
-      }
+      this.apiVersionPreferred = apiVersionPreferred;
+      this.apiBase = this.computeApiBase();
+      legacyRegisterApi(this);
     }
   }
 
@@ -502,18 +401,47 @@ export class KubeApi<
     });
   }
 
-  getUrl({ name, namespace }: Partial<ResourceDescriptor> = {}, query?: Partial<KubeApiQueryParams>) {
+  /**
+   * This method differs from {@link formatUrlForNotListing} because this treats `""` as "all namespaces"
+   * @param namespace The namespace to list in or `""` for all namespaces
+   */
+  formatUrlForListing(namespace: string) {
+    return createKubeApiURL({
+      apiPrefix: this.apiPrefix,
+      apiVersion: this.apiVersionWithGroup,
+      resource: this.apiResource,
+      namespace: this.isNamespaced
+        ? namespace ?? "default"
+        : undefined,
+    });
+  }
+
+  /**
+   * Format a URL pathname and query for acting upon a specific resource.
+   */
+  formatUrlForNotListing(resource?: Partial<ResourceDescriptor>, query?: Partial<KubeApiQueryParams>): string;
+
+  formatUrlForNotListing({ name, namespace }: Partial<ResourceDescriptor> = {}, query?: Partial<KubeApiQueryParams>) {
     const resourcePath = createKubeApiURL({
       apiPrefix: this.apiPrefix,
       apiVersion: this.apiVersionWithGroup,
       resource: this.apiResource,
-      namespace: this.isNamespaced ? namespace ?? "default" : undefined,
+      namespace: this.isNamespaced
+        ? namespace || "default"
+        : undefined,
       name,
     });
 
     return resourcePath + (query ? `?${stringify(this.normalizeQuery(query))}` : "");
   }
 
+  /**
+   * @deprecated use {@link formatUrlForNotListing} instead
+   */
+  getUrl(resource?: Partial<ResourceDescriptor>, query?: Partial<KubeApiQueryParams>) {
+    return this.formatUrlForNotListing(resource, query);
+  }
+
   protected normalizeQuery(query: Partial<KubeApiQueryParams> = {}) {
     if (query.labelSelector) {
       query.labelSelector = [query.labelSelector].flat().join(",");
@@ -591,7 +519,7 @@ export class KubeApi<
   async list({ namespace = "", reqInit }: KubeApiListOptions = {}, query?: KubeApiQueryParams): Promise<Object[] | null> {
     await this.checkPreferredVersion();
 
-    const url = this.getUrl({ namespace });
+    const url = this.formatUrlForListing(namespace);
     const res = await this.request.get(url, { query }, reqInit);
     const parsed = this.parseResponse(res, namespace);
 
@@ -609,7 +537,7 @@ export class KubeApi<
   async get(desc: ResourceDescriptor, query?: KubeApiQueryParams): Promise<Object | null> {
     await this.checkPreferredVersion();
 
-    const url = this.getUrl(desc);
+    const url = this.formatUrlForNotListing(desc);
     const res = await this.request.get(url, { query });
     const parsed = this.parseResponse(res);
 
@@ -623,7 +551,7 @@ export class KubeApi<
   async create({ name, namespace }: Partial<ResourceDescriptor>, partialData?: PartialDeep<Object>): Promise<Object | null> {
     await this.checkPreferredVersion();
 
-    const apiUrl = this.getUrl({ namespace });
+    const apiUrl = this.formatUrlForNotListing({ namespace });
     const data = merge(partialData, {
       kind: this.kind,
       apiVersion: this.apiVersionWithGroup,
@@ -644,7 +572,7 @@ export class KubeApi<
 
   async update({ name, namespace }: ResourceDescriptor, data: PartialDeep<Object>): Promise<Object | null> {
     await this.checkPreferredVersion();
-    const apiUrl = this.getUrl({ namespace, name });
+    const apiUrl = this.formatUrlForNotListing({ namespace, name });
 
     const res = await this.request.put(apiUrl, {
       data: merge(data, {
@@ -663,9 +591,13 @@ export class KubeApi<
     return parsed;
   }
 
+  async patch(desc: ResourceDescriptor, data: PartialDeep<Object>): Promise<Object | null>;
+  async patch(desc: ResourceDescriptor, data: PartialDeep<Object>, strategy: "strategic" | "merge"): Promise<Object | null>;
+  async patch(desc: ResourceDescriptor, data: Patch, strategy: "json"): Promise<Object | null>;
+  async patch(desc: ResourceDescriptor, data: PartialDeep<Object> | Patch, strategy: KubeApiPatchType): Promise<Object | null>;
   async patch(desc: ResourceDescriptor, data: PartialDeep<Object> | Patch, strategy: KubeApiPatchType = "strategic"): Promise<Object | null> {
     await this.checkPreferredVersion();
-    const apiUrl = this.getUrl(desc);
+    const apiUrl = this.formatUrlForNotListing(desc);
 
     const res = await this.request.patch(apiUrl, { data }, {
       headers: {
@@ -683,7 +615,7 @@ export class KubeApi<
 
   async delete({ propagationPolicy = "Background", ...desc }: DeleteResourceDescriptor) {
     await this.checkPreferredVersion();
-    const apiUrl = this.getUrl(desc);
+    const apiUrl = this.formatUrlForNotListing(desc);
 
     return this.request.del(apiUrl, {
       query: {
@@ -692,25 +624,30 @@ export class KubeApi<
     });
   }
 
-  getWatchUrl(namespace = "", query: KubeApiQueryParams = {}) {
-    return this.getUrl({ namespace }, {
+  getWatchUrl(namespace?: string, query: KubeApiQueryParams = {}) {
+    return this.formatUrlForNotListing({ namespace }, {
       watch: 1,
       resourceVersion: this.getResourceVersion(namespace),
       ...query,
     });
   }
 
-  watch(opts: KubeApiWatchOptions<Object, Data> = { namespace: "", retry: false }): () => void {
+  watch(opts?: KubeApiWatchOptions<Object, Data>): () => void {
     let errorReceived = false;
     let timedRetry: NodeJS.Timeout;
-    const { namespace, callback = noop, retry, timeout } = opts;
-    const { watchId = `${this.kind.toLowerCase()}-${this.watchId++}` } = opts;
+    const {
+      namespace,
+      callback = noop as KubeApiWatchCallback<Data>,
+      retry = false,
+      timeout = 600,
+      watchId = `${this.kind.toLowerCase()}-${this.watchId++}`,
+    } = opts ?? {};
 
     // Create AbortController for this request
-    const abortController = new WrappedAbortController(opts.abortController);
+    const abortController = new WrappedAbortController(opts?.abortController);
 
     abortController.signal.addEventListener("abort", () => {
-      logger.info(`[KUBE-API] watch (${watchId}) aborted ${watchUrl}`);
+      this.dependencies.logger.info(`[KUBE-API] watch (${watchId}) aborted ${watchUrl}`);
       clearTimeout(timedRetry);
     });
 
@@ -718,10 +655,9 @@ export class KubeApi<
     const watchUrl = this.getWatchUrl(namespace);
     const responsePromise = this.request.getResponse(watchUrl, requestParams, {
       signal: abortController.signal,
-      timeout: 600_000,
     });
 
-    logger.info(`[KUBE-API] watch (${watchId}) ${retry === true ? "retried" : "started"} ${watchUrl}`);
+    this.dependencies.logger.info(`[KUBE-API] watch (${watchId}) ${retry === true ? "retried" : "started"} ${watchUrl}`);
 
     responsePromise
       .then(response => {
@@ -729,7 +665,7 @@ export class KubeApi<
         let requestRetried = false;
 
         if (!response.ok) {
-          logger.warn(`[KUBE-API] watch (${watchId}) error response ${watchUrl}`, { status: response.status });
+          this.dependencies.logger.warn(`[KUBE-API] watch (${watchId}) error response ${watchUrl}`, { status: response.status });
 
           return callback(null, response);
         }
@@ -746,7 +682,7 @@ export class KubeApi<
             // Close current request
             abortController.abort();
 
-            logger.info(`[KUBE-API] Watch timeout set, but not retried, retrying now`);
+            this.dependencies.logger.info(`[KUBE-API] Watch timeout set, but not retried, retrying now`);
 
             requestRetried = true;
 
@@ -757,7 +693,21 @@ export class KubeApi<
           }, timeout * 1000 * 1.1);
         }
 
-        ["end", "close", "error"].forEach((eventName) => {
+        if (!response.body || !response.body.readable) {
+          if (!response.body) {
+            this.dependencies.logger.warn(`[KUBE-API]: watch (${watchId}) did not return a body`);
+          }
+          requestRetried = true;
+
+          clearTimeout(timedRetry);
+          timedRetry = setTimeout(() => { // we did not get any kubernetes errors so let's retry
+            this.watch({ ...opts, namespace, callback, watchId, retry: true });
+          }, 1000);
+
+          return;
+        }
+
+        for (const eventName of ["end", "close", "error"]) {
           response.body.on(eventName, () => {
             // We only retry if we haven't retried, haven't aborted and haven't received k8s error
             // kubernetes errors (=errorReceived set) should be handled in a callback
@@ -765,7 +715,7 @@ export class KubeApi<
               return;
             }
 
-            logger.info(`[KUBE-API] watch (${watchId}) ${eventName} ${watchUrl}`);
+            this.dependencies.logger.info(`[KUBE-API] watch (${watchId}) ${eventName} ${watchUrl}`);
 
             requestRetried = true;
 
@@ -774,11 +724,11 @@ export class KubeApi<
               this.watch({ ...opts, namespace, callback, watchId, retry: true });
             }, 1000);
           });
-        });
+        }
 
         byline(response.body).on("data", (line) => {
           try {
-            const event = JSON.parse(line) as IKubeWatchEvent<KubeJsonApiData<KubeObjectMetadata>>;
+            const event = JSON.parse(line) as IKubeWatchEvent<Data>;
 
             if (event.type === "ERROR" && isKubeStatusData(event.object)) {
               errorReceived = true;
@@ -794,8 +744,9 @@ export class KubeApi<
         });
       })
       .catch(error => {
-        logger.error(`[KUBE-API] watch (${watchId}) throwed ${watchUrl}`, error);
-
+        if (!abortController.signal.aborted) {
+          this.dependencies.logger.error(`[KUBE-API] watch (${watchId}) threw ${watchUrl}`, error);
+        }
         callback(null, error);
       });
 
diff --git a/src/common/k8s-api/kube-json-api.ts b/src/common/k8s-api/kube-json-api.ts
index 2624f030c8..16ca5cda70 100644
--- a/src/common/k8s-api/kube-json-api.ts
+++ b/src/common/k8s-api/kube-json-api.ts
@@ -6,8 +6,6 @@
 import type { JsonApiData, JsonApiError } from "./json-api";
 import { JsonApi } from "./json-api";
 import type { Response } from "node-fetch";
-import { apiKubePrefix, isDebugging } from "../vars";
-import { apiBase } from "./api-base";
 import type { KubeJsonApiObjectMetadata } from "./kube-object";
 
 export interface KubeJsonApiListMetadata {
@@ -47,20 +45,6 @@ export interface KubeJsonApiError extends JsonApiError {
 }
 
 export class KubeJsonApi extends JsonApi<KubeJsonApiData> {
-  static forCluster(clusterId: string): KubeJsonApi {
-    const url = new URL(apiBase.config.serverAddress);
-
-    return new this({
-      serverAddress: apiBase.config.serverAddress,
-      apiBase: apiKubePrefix,
-      debug: isDebugging,
-    }, {
-      headers: {
-        "Host": `${clusterId}.localhost:${url.port}`,
-      },
-    });
-  }
-
   protected parseError(error: KubeJsonApiError | string, res: Response): string[] {
     if (typeof error === "string") {
       return [error];
diff --git a/src/common/k8s-api/kube-object.store.ts b/src/common/k8s-api/kube-object.store.ts
index 5412bbc87c..309c183e42 100644
--- a/src/common/k8s-api/kube-object.store.ts
+++ b/src/common/k8s-api/kube-object.store.ts
@@ -7,7 +7,7 @@ import type { ClusterContext } from "./cluster-context";
 
 import { action, computed, makeObservable, observable, reaction, when } from "mobx";
 import type { Disposer } from "../utils";
-import { waitUntilDefined, autoBind, includes, isRequestError, noop, rejectPromiseBy } from "../utils";
+import { waitUntilDefined, autoBind, includes, noop, rejectPromiseBy } from "../utils";
 import type { KubeJsonApiDataFor, KubeObject } from "./kube-object";
 import { KubeStatus } from "./kube-object";
 import type { IKubeWatchEvent } from "./kube-watch-event";
@@ -221,11 +221,7 @@ export abstract class KubeObjectStore<
         try {
           return await res ?? [];
         } catch (error) {
-          onLoadFailure((
-            isRequestError(error)
-              ? error.message || error.toString()
-              : "Unknown error"
-          ));
+          onLoadFailure(new Error(`Failed to load ${this.api.apiBase}`, { cause: error }));
 
           // reset the store because we are loading all, so that nothing is displayed
           this.items.clear();
@@ -253,7 +249,7 @@ export abstract class KubeObjectStore<
 
         case "rejected":
           if (onLoadFailure) {
-            onLoadFailure(result.reason.message || result.reason);
+            onLoadFailure(new Error(`Failed to load ${this.api.apiBase}`, { cause: result.reason }));
           } else {
             // if onLoadFailure is not provided then preserve old behaviour
             throw result.reason;
@@ -432,7 +428,7 @@ export abstract class KubeObjectStore<
   protected eventsBuffer = observable.array<IKubeWatchEvent<D>>([], { deep: false });
 
   protected bindWatchEventsUpdater(delay = 1000) {
-    reaction(() => this.eventsBuffer.length, this.updateFromEventsBuffer, {
+    reaction(() => [...this.eventsBuffer], this.updateFromEventsBuffer, {
       delay,
     });
   }
@@ -477,7 +473,6 @@ export abstract class KubeObjectStore<
       callback,
     });
 
-    // TODO: upgrade node-fetch once we are starting to use ES modules
     const signal = abortController.signal;
 
     const callback: KubeApiWatchCallback<D> = (data, error) => {
diff --git a/src/common/k8s-api/kube-object.ts b/src/common/k8s-api/kube-object.ts
index 0851729bc7..24e34eff4b 100644
--- a/src/common/k8s-api/kube-object.ts
+++ b/src/common/k8s-api/kube-object.ts
@@ -9,11 +9,15 @@ import moment from "moment";
 import type { KubeJsonApiData, KubeJsonApiDataList, KubeJsonApiListMetadata } from "./kube-json-api";
 import { autoBind, formatDuration, hasOptionalTypedProperty, hasTypedProperty, isObject, isString, isNumber, bindPredicate, isTypedArray, isRecord, json } from "../utils";
 import type { ItemObject } from "../item.store";
-import { apiKube } from "./index";
-import * as resourceApplierApi from "./endpoints/resource-applier.api";
 import type { Patch } from "rfc6902";
 import assert from "assert";
 import type { JsonObject } from "type-fest";
+import { asLegacyGlobalFunctionForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api";
+import requestKubeObjectPatchInjectable from "./endpoints/resource-applier.api/request-patch.injectable";
+import { asLegacyGlobalForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
+import { apiKubeInjectionToken } from "./api-kube";
+import requestKubeObjectCreationInjectable from "./endpoints/resource-applier.api/request-update.injectable";
+import { dump } from "js-yaml";
 
 export type KubeJsonApiDataFor<K> = K extends KubeObject<infer Metadata, infer Status, infer Spec>
   ? KubeJsonApiData<Metadata, Status, Spec>
@@ -375,6 +379,12 @@ export type ScopedNamespace<Namespaced extends KubeObjectScope> = (
       : string | undefined
 );
 
+const resourceApplierAnnotationsForFiltering = [
+  "kubectl.kubernetes.io/last-applied-configuration",
+];
+
+const filterOutResourceApplierAnnotations = (label: string) => !resourceApplierAnnotationsForFiltering.some(key => label.startsWith(key));
+
 export class KubeObject<
   Metadata extends KubeObjectMetadata<KubeObjectScope> = KubeObjectMetadata<KubeObjectScope>,
   Status = unknown,
@@ -588,11 +598,11 @@ export class KubeObject<
   getAnnotations(filter = false): string[] {
     const labels = KubeObject.stringifyLabels(this.metadata.annotations);
 
-    return filter ? labels.filter(label => {
-      const skip = resourceApplierApi.annotations.some(key => label.startsWith(key));
+    if (!filter) {
+      return labels;
+    }
 
-      return !skip;
-    }) : labels;
+    return labels.filter(filterOutResourceApplierAnnotations);
   }
 
   getOwnerRefs() {
@@ -634,7 +644,9 @@ export class KubeObject<
       }
     }
 
-    return resourceApplierApi.patch(this.getName(), this.kind, this.getNs(), patch);
+    const requestKubeObjectPatch = asLegacyGlobalFunctionForExtensionApi(requestKubeObjectPatchInjectable);
+
+    return requestKubeObjectPatch(this.getName(), this.kind, this.getNs(), patch);
   }
 
   /**
@@ -647,11 +659,13 @@ export class KubeObject<
    * @deprecated use KubeApi.update instead
    */
   async update(data: Partial<this>): Promise<KubeJsonApiData | null> {
-    // use unified resource-applier api for updating all k8s objects
-    return resourceApplierApi.update({
+    const requestKubeObjectCreation = asLegacyGlobalFunctionForExtensionApi(requestKubeObjectCreationInjectable);
+    const descriptor = dump({
       ...this.toPlainObject(),
       ...data,
     });
+
+    return requestKubeObjectCreation(descriptor);
   }
 
   /**
@@ -660,6 +674,8 @@ export class KubeObject<
   delete(params?: object) {
     assert(this.selfLink, "selfLink must be present to delete self");
 
+    const apiKube = asLegacyGlobalForExtensionApi(apiKubeInjectionToken);
+
     return apiKube.del(this.selfLink, params);
   }
 }
diff --git a/src/common/k8s-api/window-location.global-override-for-injectable.ts b/src/common/k8s-api/window-location.global-override-for-injectable.ts
new file mode 100644
index 0000000000..616e110c88
--- /dev/null
+++ b/src/common/k8s-api/window-location.global-override-for-injectable.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import windowLocationInjectable from "./window-location.injectable";
+
+export default getGlobalOverride(windowLocationInjectable, () => ({
+  host: "localhost",
+  port: "12345",
+}));
diff --git a/src/common/k8s-api/window-location.injectable.ts b/src/common/k8s-api/window-location.injectable.ts
new file mode 100644
index 0000000000..80bcd44be6
--- /dev/null
+++ b/src/common/k8s-api/window-location.injectable.ts
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+
+const windowLocationInjectable = getInjectable({
+  id: "window-location",
+  instantiate: () => {
+    const { host, port } = window.location;
+
+    return { host, port };
+  },
+  causesSideEffects: true,
+});
+
+export default windowLocationInjectable;
diff --git a/src/common/k8s/create-resource-stack.injectable.ts b/src/common/k8s/create-resource-stack.injectable.ts
new file mode 100644
index 0000000000..083d240b3a
--- /dev/null
+++ b/src/common/k8s/create-resource-stack.injectable.ts
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { KubernetesCluster } from "../catalog-entities";
+import readDirectoryInjectable from "../fs/read-directory.injectable";
+import readFileInjectable from "../fs/read-file.injectable";
+import { kubectlApplyAllInjectionToken, kubectlDeleteAllInjectionToken } from "../kube-helpers/channels";
+import loggerInjectable from "../logger.injectable";
+import joinPathsInjectable from "../path/join-paths.injectable";
+import type { ResourceApplyingStack, ResourceStackDependencies } from "./resource-stack";
+import { ResourceStack } from "./resource-stack";
+
+export type CreateResourceStack = (cluster: KubernetesCluster, name: string) => ResourceApplyingStack;
+
+const createResourceStackInjectable = getInjectable({
+  id: "create-resource-stack",
+  instantiate: (di): CreateResourceStack => {
+    const deps: ResourceStackDependencies = {
+      joinPaths: di.inject(joinPathsInjectable),
+      kubectlApplyAll: di.inject(kubectlApplyAllInjectionToken),
+      kubectlDeleteAll: di.inject(kubectlDeleteAllInjectionToken),
+      logger: di.inject(loggerInjectable),
+      readDirectory: di.inject(readDirectoryInjectable),
+      readFile: di.inject(readFileInjectable),
+    };
+
+    return (cluster, name) => new ResourceStack(deps, cluster, name);
+  },
+});
+
+export default createResourceStackInjectable;
diff --git a/src/common/k8s/resource-stack.ts b/src/common/k8s/resource-stack.ts
index d289a375b3..771b48b413 100644
--- a/src/common/k8s/resource-stack.ts
+++ b/src/common/k8s/resource-stack.ts
@@ -2,20 +2,39 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import fse from "fs-extra";
-import path from "path";
 import hb from "handlebars";
-import { ResourceApplier } from "../../main/resource-applier";
 import type { KubernetesCluster } from "../catalog-entities";
-import logger from "../../main/logger";
-import { app } from "electron";
-import { ClusterStore } from "../cluster-store/cluster-store";
 import yaml from "js-yaml";
-import { productName } from "../vars";
-import { requestKubectlApplyAll, requestKubectlDeleteAll } from "../../renderer/ipc";
+import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
+import productNameInjectable from "../vars/product-name.injectable";
+import type { AsyncResult } from "../utils/async-result";
+import type { Logger } from "../logger";
+import type { KubectlApplyAll, KubectlDeleteAll } from "../kube-helpers/channels";
+import type { ReadDirectory } from "../fs/read-directory.injectable";
+import type { JoinPaths } from "../path/join-paths.injectable";
+import type { ReadFile } from "../fs/read-file.injectable";
+import { hasTypedProperty, isObject } from "../utils";
+
+export interface ResourceApplyingStack {
+  kubectlApplyFolder(folderPath: string, templateContext?: any, extraArgs?: string[]): Promise<string>;
+  kubectlDeleteFolder(folderPath: string, templateContext?: any, extraArgs?: string[]): Promise<string>;
+}
+
+export interface ResourceStackDependencies {
+  readonly logger: Logger;
+  kubectlApplyAll: KubectlApplyAll;
+  kubectlDeleteAll: KubectlDeleteAll;
+  readDirectory: ReadDirectory;
+  joinPaths: JoinPaths;
+  readFile: ReadFile;
+}
 
 export class ResourceStack {
-  constructor(protected cluster: KubernetesCluster, protected name: string) {}
+  constructor(
+    protected readonly dependencies: ResourceStackDependencies,
+    protected readonly cluster: KubernetesCluster,
+    protected readonly name: string,
+  ) {}
 
   /**
    *
@@ -24,8 +43,15 @@ export class ResourceStack {
    */
   async kubectlApplyFolder(folderPath: string, templateContext?: any, extraArgs?: string[]): Promise<string> {
     const resources = await this.renderTemplates(folderPath, templateContext);
+    const result = await this.applyResources(resources, extraArgs);
 
-    return this.applyResources(resources, extraArgs);
+    if (result.callWasSuccessful) {
+      return result.response;
+    }
+
+    this.dependencies.logger.warn(`[RESOURCE-STACK]: failed to apply resources: ${result.error}`);
+
+    return "";
   }
 
   /**
@@ -35,79 +61,60 @@ export class ResourceStack {
    */
   async kubectlDeleteFolder(folderPath: string, templateContext?: any, extraArgs?: string[]): Promise<string> {
     const resources = await this.renderTemplates(folderPath, templateContext);
+    const result = await this.deleteResources(resources, extraArgs);
 
-    return this.deleteResources(resources, extraArgs);
+    if (result.callWasSuccessful) {
+      return result.response;
+    }
+
+    this.dependencies.logger.warn(`[RESOURCE-STACK]: failed to delete resources: ${result.error}`);
+
+    return "";
   }
 
-  protected async applyResources(resources: string[], extraArgs?: string[]): Promise<string> {
-    const clusterModel = ClusterStore.getInstance().getById(this.cluster.getId());
+  protected async applyResources(resources: string[], extraArgs: string[] = []): Promise<AsyncResult<string, string>> {
+    const kubectlArgs = [...extraArgs, ...this.getAdditionalArgs(extraArgs)];
 
-    if (!clusterModel) {
-      throw new Error(`cluster not found`);
-    }
-
-    let kubectlArgs = extraArgs || [];
-
-    kubectlArgs = this.appendKubectlArgs(kubectlArgs);
-
-    if (app) {
-      return await new ResourceApplier(clusterModel).kubectlApplyAll(resources, kubectlArgs);
-    } else {
-      const response = await requestKubectlApplyAll(this.cluster.getId(), resources, kubectlArgs);
-
-      if (response.stderr) {
-        throw new Error(response.stderr);
-      }
-
-      return response.stdout ?? "";
-    }
+    return this.dependencies.kubectlApplyAll({
+      clusterId: this.cluster.getId(),
+      resources,
+      extraArgs: kubectlArgs,
+    });
   }
 
-  protected async deleteResources(resources: string[], extraArgs?: string[]): Promise<string> {
-    const clusterModel = ClusterStore.getInstance().getById(this.cluster.getId());
+  protected async deleteResources(resources: string[], extraArgs: string[] = []): Promise<AsyncResult<string, string>> {
+    const kubectlArgs = [...extraArgs, ...this.getAdditionalArgs(extraArgs)];
 
-    if (!clusterModel) {
-      throw new Error(`cluster not found`);
-    }
-
-    let kubectlArgs = extraArgs || [];
-
-    kubectlArgs = this.appendKubectlArgs(kubectlArgs);
-
-    if (app) {
-      return await new ResourceApplier(clusterModel).kubectlDeleteAll(resources, kubectlArgs);
-    } else {
-      const response = await requestKubectlDeleteAll(this.cluster.getId(), resources, kubectlArgs);
-
-      if (response.stderr) {
-        throw new Error(response.stderr);
-      }
-
-      return response.stdout ?? "";
-    }
+    return this.dependencies.kubectlDeleteAll({
+      clusterId: this.cluster.getId(),
+      resources,
+      extraArgs: kubectlArgs,
+    });
   }
 
-  protected appendKubectlArgs(kubectlArgs: string[]) {
+  protected getAdditionalArgs(kubectlArgs: string[]): string[] {
     if (!kubectlArgs.includes("-l") && !kubectlArgs.includes("--label")) {
-      return kubectlArgs.concat(["-l", `app.kubernetes.io/name=${this.name}`]);
+      return ["-l", `app.kubernetes.io/name=${this.name}`];
     }
 
-    return kubectlArgs;
+    return [];
   }
 
   protected async renderTemplates(folderPath: string, templateContext: any): Promise<string[]> {
     const resources: string[] = [];
+    const di = getLegacyGlobalDiForExtensionApi();
+    const productName = di.inject(productNameInjectable);
 
-    logger.info(`[RESOURCE-STACK]: render templates from ${folderPath}`);
-    const files = await fse.readdir(folderPath);
+    this.dependencies.logger.info(`[RESOURCE-STACK]: render templates from ${folderPath}`);
+    const files = await this.dependencies.readDirectory(folderPath);
 
-    for(const filename of files) {
-      const file = path.join(folderPath, filename);
-      const raw = await fse.readFile(file);
+    for (const filename of files) {
+      const file = this.dependencies.joinPaths(folderPath, filename);
+      const raw = await this.dependencies.readFile(file);
       const data = (
         filename.endsWith(".hb")
-          ? hb.compile(raw.toString())(templateContext)
-          : raw.toString()
+          ? hb.compile(raw)(templateContext)
+          : raw
       ).trim();
 
       if (!data) {
@@ -119,16 +126,15 @@ export class ResourceStack {
           continue;
         }
 
-        const resource = entry as Record<string, any>;
+        if (hasTypedProperty(entry, "metadata", isObject)) {
+          const labels = (entry.metadata.labels ??= {}) as Partial<Record<string, string>>;
 
-        if (typeof resource.metadata === "object") {
-          resource.metadata.labels ??= {};
-          resource.metadata.labels["app.kubernetes.io/name"] = this.name;
-          resource.metadata.labels["app.kubernetes.io/managed-by"] = productName;
-          resource.metadata.labels["app.kubernetes.io/created-by"] = "resource-stack";
+          labels["app.kubernetes.io/name"] = this.name;
+          labels["app.kubernetes.io/managed-by"] = productName;
+          labels["app.kubernetes.io/created-by"] = "resource-stack";
         }
 
-        resources.push(yaml.dump(resource));
+        resources.push(yaml.dump(entry));
       }
     }
 
diff --git a/src/common/kube-helpers.ts b/src/common/kube-helpers.ts
index f24d4dbe2d..dc388efbc8 100644
--- a/src/common/kube-helpers.ts
+++ b/src/common/kube-helpers.ts
@@ -4,31 +4,14 @@
  */
 
 import { KubeConfig } from "@kubernetes/client-node";
-import fse from "fs-extra";
-import path from "path";
-import os from "os";
 import yaml from "js-yaml";
 import logger from "../main/logger";
 import type { Cluster, Context, User } from "@kubernetes/client-node/dist/config_types";
 import { newClusters, newContexts, newUsers } from "@kubernetes/client-node/dist/config_types";
-import { isDefined, resolvePath } from "./utils";
+import { isDefined } from "./utils";
 import Joi from "joi";
 import type { PartialDeep } from "type-fest";
 
-export const kubeConfigDefaultPath = path.join(os.homedir(), ".kube", "config");
-
-export function loadConfigFromFileSync(filePath: string): ConfigResult {
-  const content = fse.readFileSync(resolvePath(filePath), "utf-8");
-
-  return loadConfigFromString(content);
-}
-
-export async function loadConfigFromFile(filePath: string): Promise<ConfigResult> {
-  const content = await fse.readFile(resolvePath(filePath), "utf-8");
-
-  return loadConfigFromString(content);
-}
-
 const clusterSchema = Joi.object({
   name: Joi
     .string()
diff --git a/src/common/kube-helpers/channels.ts b/src/common/kube-helpers/channels.ts
new file mode 100644
index 0000000000..4782f64367
--- /dev/null
+++ b/src/common/kube-helpers/channels.ts
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectionToken } from "@ogre-tools/injectable";
+import type { Asyncify } from "type-fest";
+import type { RequestChannelHandler } from "../../main/utils/channel/channel-listeners/listener-tokens";
+import type { ClusterId } from "../cluster-types";
+import type { AsyncResult } from "../utils/async-result";
+import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+
+export interface KubectlApplyAllArgs {
+  clusterId: ClusterId;
+  resources: string[];
+  extraArgs: string[];
+}
+
+export const kubectlApplyAllChannel: RequestChannel<KubectlApplyAllArgs, AsyncResult<string, string>> = {
+  id: "kubectl-apply-all",
+};
+
+export type KubectlApplyAll = Asyncify<RequestChannelHandler<typeof kubectlApplyAllChannel>>;
+
+export const kubectlApplyAllInjectionToken = getInjectionToken<KubectlApplyAll>({
+  id: "kubectl-apply-all",
+});
+
+export interface KubectlDeleteAllArgs {
+  clusterId: ClusterId;
+  resources: string[];
+  extraArgs: string[];
+}
+
+export const kubectlDeleteAllChannel: RequestChannel<KubectlDeleteAllArgs, AsyncResult<string, string>> = {
+  id: "kubectl-delete-all",
+};
+
+export type KubectlDeleteAll = Asyncify<RequestChannelHandler<typeof kubectlDeleteAllChannel>>;
+
+export const kubectlDeleteAllInjectionToken = getInjectionToken<KubectlDeleteAll>({
+  id: "kubectl-delete-all",
+});
diff --git a/src/common/kube-helpers/load-config-from-file.injectable.ts b/src/common/kube-helpers/load-config-from-file.injectable.ts
new file mode 100644
index 0000000000..afa9d3c070
--- /dev/null
+++ b/src/common/kube-helpers/load-config-from-file.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import readFileInjectable from "../fs/read-file.injectable";
+import type { ConfigResult } from "../kube-helpers";
+import { loadConfigFromString } from "../kube-helpers";
+import resolveTildeInjectable from "../path/resolve-tilde.injectable";
+
+export type LoadConfigfromFile = (filePath: string) => Promise<ConfigResult>;
+
+const loadConfigfromFileInjectable = getInjectable({
+  id: "load-configfrom-file",
+  instantiate: (di): LoadConfigfromFile => {
+    const readFile = di.inject(readFileInjectable);
+    const resolveTilde = di.inject(resolveTildeInjectable);
+
+    return async (filePath) => loadConfigFromString(await readFile(resolveTilde(filePath)));
+  },
+});
+
+export default loadConfigfromFileInjectable;
diff --git a/src/common/log-error.global-override-for-injectable.ts b/src/common/log-error.global-override-for-injectable.ts
new file mode 100644
index 0000000000..e3a03c2802
--- /dev/null
+++ b/src/common/log-error.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getGlobalOverrideForFunction } from "./test-utils/get-global-override-for-function";
+import logErrorInjectable from "./log-error.injectable";
+
+// Note: this should remain as it is, and throw if called. Logging error is something
+// that cannot happen without a unit test explicitly causing it. It cannot be allowed
+// to happen without author of unit test knowing it.
+export default getGlobalOverrideForFunction(logErrorInjectable);
diff --git a/src/common/logger-transports/sentry.ts b/src/common/logger-transports/sentry.ts
deleted file mode 100644
index b5855c42f8..0000000000
--- a/src/common/logger-transports/sentry.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import Transport from "winston-transport";
-import { LEVEL } from "triple-beam";
-import { Severity } from "@sentry/browser";
-import * as Sentry from "@sentry/electron";
-
-const SENTRY_LEVELS_MAP = {
-  silly: Severity.Debug,
-  verbose: Severity.Debug,
-  debug: Severity.Debug,
-  info: Severity.Info,
-  warn: Severity.Warning,
-  error: Severity.Error,
-};
-const WINSTON_CMP: Record<WinstonLevel, Set<WinstonLevel>> = {
-  silly: new Set(["silly", "verbose", "debug", "info", "warn", "error"]),
-  verbose: new Set(["verbose", "debug", "info", "warn", "error"]),
-  debug: new Set(["debug", "info", "warn", "error"]),
-  info: new Set(["info", "warn", "error"]),
-  warn: new Set(["warn", "error"]),
-  error: new Set(["error"]),
-};
-
-export type WinstonLevel = keyof typeof SENTRY_LEVELS_MAP;
-
-export class SentryTransport extends Transport {
-  logLevels: Set<WinstonLevel>;
-
-  constructor(minWinstonLevel: WinstonLevel) {
-    super();
-
-    this.logLevels = WINSTON_CMP[minWinstonLevel];
-  }
-
-  log(info: any, next: () => void) {
-    setImmediate(() => {
-      this.emit("logged", info);
-    });
-
-    const { message, level: _, tags, user, ...extra } = info;
-    const winstonLevel: WinstonLevel = info[LEVEL];
-    const level = SENTRY_LEVELS_MAP[winstonLevel];
-
-    try {
-      if (this.logLevels.has(winstonLevel)) {
-        Sentry.captureMessage(message, {
-          level,
-          tags,
-          extra,
-        });
-      }
-    } finally {
-      next();
-    }
-  }
-}
diff --git a/src/common/logger.injectable.ts b/src/common/logger.injectable.ts
index 55e2f26b2a..e1a085f199 100644
--- a/src/common/logger.injectable.ts
+++ b/src/common/logger.injectable.ts
@@ -3,12 +3,19 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
+import { createLogger, format } from "winston";
 import type { Logger } from "./logger";
-import logger from "./logger";
+import { loggerTransportInjectionToken } from "./logger/transports";
 
 const loggerInjectable = getInjectable({
   id: "logger",
-  instantiate: (): Logger => logger,
+  instantiate: (di): Logger => createLogger({
+    format: format.combine(
+      format.splat(),
+      format.simple(),
+    ),
+    transports: di.injectMany(loggerTransportInjectionToken),
+  }),
 });
 
 export default loggerInjectable;
diff --git a/src/common/logger.ts b/src/common/logger.ts
index fd9345d61e..948404a6b9 100644
--- a/src/common/logger.ts
+++ b/src/common/logger.ts
@@ -3,12 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { app, ipcMain } from "electron";
-import winston, { format } from "winston";
-import type Transport from "winston-transport";
-import { consoleFormat } from "winston-console-format";
-import { isDebugging, isTestEnv } from "./vars";
-import BrowserConsole from "winston-transport-browserconsole";
+import { asLegacyGlobalForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
+import loggerInjectable from "./logger.injectable";
 
 export interface Logger {
   info: (message: string, ...args: any) => void;
@@ -18,64 +14,7 @@ export interface Logger {
   silly: (message: string, ...args: any) => void;
 }
 
-const logLevel = process.env.LOG_LEVEL
-  ? process.env.LOG_LEVEL
-  : isDebugging
-    ? "debug"
-    : isTestEnv
-      ? "error"
-      : "info";
-
-const transports: Transport[] = [];
-
-if (ipcMain) {
-  transports.push(
-    new winston.transports.Console({
-      handleExceptions: false,
-      level: logLevel,
-      format: format.combine(
-        format.colorize({ level: true, message: false }),
-        format.padLevels(),
-        format.ms(),
-        consoleFormat({
-          showMeta: true,
-          inspectOptions: {
-            depth: 4,
-            colors: true,
-            maxArrayLength: 10,
-            breakLength: 120,
-            compact: Infinity,
-          },
-        }),
-      ),
-    }),
-  );
-
-  if (!isTestEnv) {
-    transports.push(
-      new winston.transports.File({
-        handleExceptions: false,
-        level: logLevel,
-        filename: "lens.log",
-        /**
-         * SAFTEY: the `ipcMain` check above should mean that this is only
-         * called in the main process
-         */
-        dirname: app.getPath("logs"),
-        maxsize: 16 * 1024,
-        maxFiles: 16,
-        tailable: true,
-      }),
-    );
-  }
-} else {
-  transports.push(new BrowserConsole());
-}
-
-export default winston.createLogger({
-  format: format.combine(
-    format.splat(),
-    format.simple(),
-  ),
-  transports,
-}) as Logger;
+/**
+ * @deprecated use `di.inject(loggerInjectable)` instead
+ */
+export default asLegacyGlobalForExtensionApi(loggerInjectable);
diff --git a/src/common/logger/prefixed-logger.injectable.ts b/src/common/logger/prefixed-logger.injectable.ts
new file mode 100644
index 0000000000..36f86c532f
--- /dev/null
+++ b/src/common/logger/prefixed-logger.injectable.ts
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import type { Logger } from "../logger";
+import loggerInjectable from "../logger.injectable";
+
+const prefixedLoggerInjectable = getInjectable({
+  id: "prefixed-logger",
+  instantiate: (di, prefix): Logger => {
+    const logger = di.inject(loggerInjectable);
+
+    return {
+      debug: (message, ...args) => {
+        logger.debug(`[${prefix}]: ${message}`, ...args);
+      },
+      error: (message, ...args) => {
+        logger.error(`[${prefix}]: ${message}`, ...args);
+      },
+      info: (message, ...args) => {
+        logger.info(`[${prefix}]: ${message}`, ...args);
+      },
+      silly: (message, ...args) => {
+        logger.silly(`[${prefix}]: ${message}`, ...args);
+      },
+      warn: (message, ...args) => {
+        logger.warn(`[${prefix}]: ${message}`, ...args);
+      },
+    };
+  },
+  lifecycle: lifecycleEnum.keyedSingleton({
+    getInstanceKey: (di, prefix: string) => prefix,
+  }),
+});
+
+export default prefixedLoggerInjectable;
diff --git a/src/common/logger/transports.ts b/src/common/logger/transports.ts
new file mode 100644
index 0000000000..1407eb91b8
--- /dev/null
+++ b/src/common/logger/transports.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectionToken } from "@ogre-tools/injectable";
+import type TransportStream from "winston-transport";
+
+export const loggerTransportInjectionToken = getInjectionToken<TransportStream>({
+  id: "logger-transport",
+});
diff --git a/src/common/os/home-directory-path.injectable.ts b/src/common/os/home-directory-path.injectable.ts
new file mode 100644
index 0000000000..83b4b0cdff
--- /dev/null
+++ b/src/common/os/home-directory-path.injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import userInfoInjectable from "../user-store/user-info.injectable";
+
+const homeDirectoryPathInjectable = getInjectable({
+  id: "home-directory-path",
+  instantiate: (di) => di.inject(userInfoInjectable).homedir,
+});
+
+export default homeDirectoryPathInjectable;
diff --git a/src/common/os/temp-directory-path.global-override-for-injectable.ts b/src/common/os/temp-directory-path.global-override-for-injectable.ts
new file mode 100644
index 0000000000..05615644f9
--- /dev/null
+++ b/src/common/os/temp-directory-path.global-override-for-injectable.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import tempDirectoryPathInjectable from "./temp-directory-path.injectable";
+
+export default getGlobalOverride(tempDirectoryPathInjectable, () => "/some-temp-directory");
diff --git a/src/common/vars/package-json.injectable.ts b/src/common/os/temp-directory-path.injectable.ts
similarity index 55%
rename from src/common/vars/package-json.injectable.ts
rename to src/common/os/temp-directory-path.injectable.ts
index fa132be518..46fc5db67d 100644
--- a/src/common/vars/package-json.injectable.ts
+++ b/src/common/os/temp-directory-path.injectable.ts
@@ -3,12 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import packageJson from "../../../package.json";
+import { tmpdir } from "os";
 
-const packageJsonInjectable = getInjectable({
-  id: "package-json",
-  instantiate: () => packageJson,
+const tempDirectoryPathInjectable = getInjectable({
+  id: "temp-directory-path",
+  instantiate: () => tmpdir(),
   causesSideEffects: true,
 });
 
-export default packageJsonInjectable;
+export default tempDirectoryPathInjectable;
diff --git a/src/common/path/get-absolute-path.global-override-for-injectable.ts b/src/common/path/get-absolute-path.global-override-for-injectable.ts
new file mode 100644
index 0000000000..15f377cb2c
--- /dev/null
+++ b/src/common/path/get-absolute-path.global-override-for-injectable.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import path from "path";
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import getAbsolutePathInjectable from "./get-absolute-path.injectable";
+
+export default getGlobalOverride(getAbsolutePathInjectable, () => path.posix.resolve);
diff --git a/src/common/path/get-basename.global-override-for-injectable.ts b/src/common/path/get-basename.global-override-for-injectable.ts
new file mode 100644
index 0000000000..913ec9c5c2
--- /dev/null
+++ b/src/common/path/get-basename.global-override-for-injectable.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import path from "path";
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import getBasenameOfPathInjectable from "./get-basename.injectable";
+
+export default getGlobalOverride(getBasenameOfPathInjectable, () => path.posix.basename);
diff --git a/src/common/path/get-basename.injectable.ts b/src/common/path/get-basename.injectable.ts
new file mode 100644
index 0000000000..be92bde7f5
--- /dev/null
+++ b/src/common/path/get-basename.injectable.ts
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import path from "path";
+
+export type GetBasenameOfPath = (path: string) => string;
+
+const getBasenameOfPathInjectable = getInjectable({
+  id: "get-basename-of-path",
+  instantiate: (): GetBasenameOfPath => path.basename,
+  causesSideEffects: true,
+});
+
+export default getBasenameOfPathInjectable;
diff --git a/src/common/path/get-dirname.global-override-for-injectable.ts b/src/common/path/get-dirname.global-override-for-injectable.ts
new file mode 100644
index 0000000000..ed694de182
--- /dev/null
+++ b/src/common/path/get-dirname.global-override-for-injectable.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import path from "path";
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import getDirnameOfPathInjectable from "./get-dirname.injectable";
+
+export default getGlobalOverride(getDirnameOfPathInjectable, () => path.posix.dirname);
diff --git a/src/common/path/get-dirname.injectable.ts b/src/common/path/get-dirname.injectable.ts
new file mode 100644
index 0000000000..93b4496767
--- /dev/null
+++ b/src/common/path/get-dirname.injectable.ts
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import path from "path";
+
+export type GetDirnameOfPath = (path: string) => string;
+
+const getDirnameOfPathInjectable = getInjectable({
+  id: "get-dirname-of-path",
+  instantiate: (): GetDirnameOfPath => path.dirname,
+  causesSideEffects: true,
+});
+
+export default getDirnameOfPathInjectable;
diff --git a/src/common/path/get-relative-path.global-override-for-injectable.ts b/src/common/path/get-relative-path.global-override-for-injectable.ts
new file mode 100644
index 0000000000..9e96b70301
--- /dev/null
+++ b/src/common/path/get-relative-path.global-override-for-injectable.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import path from "path";
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import getRelativePathInjectable from "./get-relative-path.injectable";
+
+export default getGlobalOverride(getRelativePathInjectable, () => path.posix.relative);
diff --git a/src/common/path/get-relative-path.injectable.ts b/src/common/path/get-relative-path.injectable.ts
new file mode 100644
index 0000000000..18b5d832de
--- /dev/null
+++ b/src/common/path/get-relative-path.injectable.ts
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import path from "path";
+
+export type GetRelativePath = (from: string, to: string) => string;
+
+const getRelativePathInjectable = getInjectable({
+  id: "get-relative-path",
+  instantiate: (): GetRelativePath => path.relative,
+  causesSideEffects: true,
+});
+
+export default getRelativePathInjectable;
diff --git a/src/common/path/is-logical-child-path.injectable.ts b/src/common/path/is-logical-child-path.injectable.ts
new file mode 100644
index 0000000000..1a52b66c0f
--- /dev/null
+++ b/src/common/path/is-logical-child-path.injectable.ts
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import getAbsolutePathInjectable from "./get-absolute-path.injectable";
+import getDirnameOfPathInjectable from "./get-dirname.injectable";
+
+/**
+ * Checks if `testPath` represents a potential filesystem entry that would be
+ * logically "within" the `parentPath` directory.
+ *
+ * This function will return `true` in the above case, and `false` otherwise.
+ * It will return `false` if the two paths are the same (after resolving them).
+ *
+ * The function makes no FS calls and is platform dependant. Meaning that the
+ * results are only guaranteed to be correct for the platform you are running
+ * on.
+ * @param parentPath The known path of a directory
+ * @param testPath The path that is to be tested
+ */
+export type IsLogicalChildPath = (parentPath: string, testPath: string) => boolean;
+
+const isLogicalChildPathInjectable = getInjectable({
+  id: "is-logical-child-path",
+  instantiate: (di): IsLogicalChildPath => {
+    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const getDirnameOfPath = di.inject(getDirnameOfPathInjectable);
+
+    return (parentPath, testPath) => {
+      const resolvedParentPath = getAbsolutePath(parentPath);
+      let resolvedTestPath = getAbsolutePath(testPath);
+
+      if (resolvedParentPath === resolvedTestPath) {
+        return false;
+      }
+
+      while (resolvedTestPath.length >= resolvedParentPath.length) {
+        if (resolvedTestPath === resolvedParentPath) {
+          return true;
+        }
+
+        resolvedTestPath = getDirnameOfPath(resolvedTestPath);
+      }
+
+      return false;
+    };
+  },
+});
+
+export default isLogicalChildPathInjectable;
diff --git a/src/common/path/join-paths.global-override-for-injectable.ts b/src/common/path/join-paths.global-override-for-injectable.ts
new file mode 100644
index 0000000000..d3e9d5e4c2
--- /dev/null
+++ b/src/common/path/join-paths.global-override-for-injectable.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import path from "path";
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import joinPathsInjectable from "./join-paths.injectable";
+
+export default getGlobalOverride(joinPathsInjectable, () => path.posix.join);
diff --git a/src/common/path/parse.global-override-for-injectable.ts b/src/common/path/parse.global-override-for-injectable.ts
new file mode 100644
index 0000000000..fad97db696
--- /dev/null
+++ b/src/common/path/parse.global-override-for-injectable.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import path from "path";
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import parsePathInjectable from "./parse.injectable";
+
+export default getGlobalOverride(parsePathInjectable, () => path.posix.parse);
diff --git a/src/renderer/components/+preferences/sentry-dns-url.injectable.ts b/src/common/path/parse.injectable.ts
similarity index 52%
rename from src/renderer/components/+preferences/sentry-dns-url.injectable.ts
rename to src/common/path/parse.injectable.ts
index 5f337436fc..a32dfb3fa5 100644
--- a/src/renderer/components/+preferences/sentry-dns-url.injectable.ts
+++ b/src/common/path/parse.injectable.ts
@@ -3,11 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { sentryDsn } from "../../../common/vars";
+import path from "path";
 
-const sentryDnsUrlInjectable = getInjectable({
-  id: "sentry-dns-url",
-  instantiate: () => sentryDsn,
+const parsePathInjectable = getInjectable({
+  id: "parse-path",
+  instantiate: () => path.parse,
+  causesSideEffects: true,
 });
 
-export default sentryDnsUrlInjectable;
+export default parsePathInjectable;
diff --git a/src/common/path/resolve-path.injectable.ts b/src/common/path/resolve-path.injectable.ts
new file mode 100644
index 0000000000..75a1e98c59
--- /dev/null
+++ b/src/common/path/resolve-path.injectable.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import getAbsolutePathInjectable from "./get-absolute-path.injectable";
+import resolveTildeInjectable from "./resolve-tilde.injectable";
+
+export type ResolvePath = (path: string) => string;
+
+const resolvePathInjectable = getInjectable({
+  id: "resolve-path",
+  instantiate: (di): ResolvePath => {
+    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const resolveTilde = di.inject(resolveTildeInjectable);
+
+    return (filePath) => getAbsolutePath(resolveTilde(filePath));
+  },
+});
+
+export default resolvePathInjectable;
diff --git a/src/common/path/resolve-tilde.injectable.ts b/src/common/path/resolve-tilde.injectable.ts
new file mode 100644
index 0000000000..86d267aa4f
--- /dev/null
+++ b/src/common/path/resolve-tilde.injectable.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import homeDirectoryPathInjectable from "../os/home-directory-path.injectable";
+import fileSystemSeparatorInjectable from "./separator.injectable";
+
+export type ResolveTilde = (path: string) => string;
+
+const resolveTildeInjectable = getInjectable({
+  id: "resolve-tilde",
+  instantiate: (di): ResolveTilde => {
+    const homeDirectoryPath = di.inject(homeDirectoryPathInjectable);
+    const fileSystemSeparator = di.inject(fileSystemSeparatorInjectable);
+
+    return (filePath) => {
+      if (filePath === "~") {
+        return homeDirectoryPath;
+      }
+
+      if (filePath === `~${fileSystemSeparator}`) {
+        return `${homeDirectoryPath}${filePath.slice(1)}`;
+      }
+
+      return filePath;
+    };
+  },
+});
+
+export default resolveTildeInjectable;
diff --git a/src/common/path/separator.global-override-for-injectable.ts b/src/common/path/separator.global-override-for-injectable.ts
new file mode 100644
index 0000000000..655f8908b0
--- /dev/null
+++ b/src/common/path/separator.global-override-for-injectable.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import path from "path";
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import fileSystemSeparatorInjectable from "./separator.injectable";
+
+export default getGlobalOverride(fileSystemSeparatorInjectable, () => path.posix.sep);
diff --git a/src/common/path/separator.injectable.ts b/src/common/path/separator.injectable.ts
new file mode 100644
index 0000000000..5b0413b56f
--- /dev/null
+++ b/src/common/path/separator.injectable.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import path from "path";
+
+const fileSystemSeparatorInjectable = getInjectable({
+  id: "file-system-separator",
+  instantiate: () => path.sep,
+  causesSideEffects: true,
+});
+
+export default fileSystemSeparatorInjectable;
diff --git a/src/common/rbac.ts b/src/common/rbac.ts
index 965fff5e46..bfa04ef46b 100644
--- a/src/common/rbac.ts
+++ b/src/common/rbac.ts
@@ -4,10 +4,11 @@
  */
 
 export type KubeResource =
-  "namespaces" | "nodes" | "events" | "resourcequotas" | "services" | "limitranges" |
+  "namespaces" | "nodes" | "events" | "resourcequotas" | "services" | "limitranges" | "leases" |
   "secrets" | "configmaps" | "ingresses" | "networkpolicies" | "persistentvolumeclaims" | "persistentvolumes" | "storageclasses" |
   "pods" | "daemonsets" | "deployments" | "statefulsets" | "replicasets" | "jobs" | "cronjobs" |
-  "endpoints" | "customresourcedefinitions" | "horizontalpodautoscalers" | "podsecuritypolicies" | "poddisruptionbudgets" | "priorityclasses" |
+  "endpoints" | "customresourcedefinitions" | "horizontalpodautoscalers" | "podsecuritypolicies" | "poddisruptionbudgets" |
+  "priorityclasses" | "runtimeclasses" |
   "roles" | "clusterroles" | "rolebindings" | "clusterrolebindings" | "serviceaccounts";
 
 export interface KubeApiResource extends KubeApiResourceData {
@@ -34,6 +35,7 @@ export const apiResourceRecord: Record<KubeResource, KubeApiResourceData> = {
   "jobs": { kind: "Job", group: "batch" },
   "namespaces": { kind: "Namespace" },
   "limitranges": { kind: "LimitRange" },
+  "leases": { kind: "Lease" },
   "networkpolicies": { kind: "NetworkPolicy", group: "networking.k8s.io" },
   "nodes": { kind: "Node" },
   "persistentvolumes": { kind: "PersistentVolume" },
@@ -42,6 +44,7 @@ export const apiResourceRecord: Record<KubeResource, KubeApiResourceData> = {
   "poddisruptionbudgets": { kind: "PodDisruptionBudget", group: "policy" },
   "podsecuritypolicies": { kind: "PodSecurityPolicy", group: "policy" },
   "priorityclasses": { kind: "PriorityClass", group: "scheduling.k8s.io" },
+  "runtimeclasses": { kind: "RuntimeClass", group: "node.k8s.io" },
   "resourcequotas": { kind: "ResourceQuota" },
   "replicasets": { kind: "ReplicaSet", group: "apps" },
   "roles": { kind: "Role", group: "rbac.authorization.k8s.io" },
diff --git a/src/common/root-frame-rendered-channel/root-frame-rendered-channel.injectable.ts b/src/common/root-frame-rendered-channel/root-frame-rendered-channel.injectable.ts
deleted file mode 100644
index a7787c6cc4..0000000000
--- a/src/common/root-frame-rendered-channel/root-frame-rendered-channel.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { MessageChannel } from "../utils/channel/message-channel-injection-token";
-import { messageChannelInjectionToken } from "../utils/channel/message-channel-injection-token";
-
-export type RootFrameRenderedChannel = MessageChannel;
-
-const rootFrameRenderedChannelInjectable = getInjectable({
-  id: "root-frame-rendered-channel",
-
-  instantiate: (): RootFrameRenderedChannel => ({
-    id: "root-frame-rendered",
-  }),
-
-  injectionToken: messageChannelInjectionToken,
-});
-
-export default rootFrameRenderedChannelInjectable;
diff --git a/src/common/root-frame/root-frame-rendered-channel.ts b/src/common/root-frame/root-frame-rendered-channel.ts
new file mode 100644
index 0000000000..060ae8735c
--- /dev/null
+++ b/src/common/root-frame/root-frame-rendered-channel.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token";
+
+export type RootFrameHasRenderedChannel = MessageChannel<void>;
+
+export const rootFrameHasRenderedChannel: RootFrameHasRenderedChannel = {
+  id: "root-frame-rendered",
+};
diff --git a/src/common/runnable/run-many-for.test.ts b/src/common/runnable/run-many-for.test.ts
index 35db17952a..c2cc152681 100644
--- a/src/common/runnable/run-many-for.test.ts
+++ b/src/common/runnable/run-many-for.test.ts
@@ -25,13 +25,19 @@ describe("runManyFor", () => {
 
       const someInjectable = getInjectable({
         id: "some-injectable",
-        instantiate: () => ({ run: () => runMock("some-call") }),
+        instantiate: () => ({
+          id: "some-injectable",
+          run: () => runMock("some-call"),
+        }),
         injectionToken: someInjectionTokenForRunnables,
       });
 
       const someOtherInjectable = getInjectable({
         id: "some-other-injectable",
-        instantiate: () => ({ run: () => runMock("some-other-call") }),
+        instantiate: () => ({
+          id: "some-other-injectable",
+          run: () => runMock("some-other-call"),
+        }),
         injectionToken: someInjectionTokenForRunnables,
       });
 
@@ -79,6 +85,7 @@ describe("runManyFor", () => {
         id: "some-injectable-1",
 
         instantiate: (di) => ({
+          id: "some-injectable-1",
           run: () => runMock("third-level-run"),
           runAfter: di.inject(someInjectable2),
         }),
@@ -90,6 +97,7 @@ describe("runManyFor", () => {
         id: "some-injectable-2",
 
         instantiate: (di) => ({
+          id: "some-injectable-2",
           run: () => runMock("second-level-run"),
           runAfter: di.inject(someInjectable3),
         }),
@@ -99,7 +107,10 @@ describe("runManyFor", () => {
 
       const someInjectable3 = getInjectable({
         id: "some-injectable-3",
-        instantiate: () => ({ run: () => runMock("first-level-run") }),
+        instantiate: () => ({
+          id: "some-injectable-3",
+          run: () => runMock("first-level-run"),
+        }),
         injectionToken: someInjectionTokenForRunnables,
       });
 
@@ -186,6 +197,7 @@ describe("runManyFor", () => {
       id: "some-runnable-1",
 
       instantiate: (di) => ({
+        id: "some-runnable-1",
         run: () => runMock("some-runnable-1"),
         runAfter: di.inject(someOtherInjectable),
       }),
@@ -197,6 +209,7 @@ describe("runManyFor", () => {
       id: "some-runnable-2",
 
       instantiate: () => ({
+        id: "some-runnable-2",
         run: () => runMock("some-runnable-2"),
       }),
 
@@ -210,7 +223,7 @@ describe("runManyFor", () => {
     );
 
     return expect(() => runMany()).rejects.toThrow(
-      "Tried to run runnable after other runnable which does not same injection token.",
+      /Tried to get a composite but encountered missing parent ids: "some-runnable-2".\n\nAvailable parent ids are:\n"[0-9a-z-]+",\n"some-runnable-1"/,
     );
   });
 
@@ -232,6 +245,7 @@ describe("runManyFor", () => {
         id: "some-runnable-1",
 
         instantiate: () => ({
+          id: "some-runnable-1",
           run: (parameter) => runMock("run-of-some-runnable-1", parameter),
         }),
 
@@ -242,6 +256,7 @@ describe("runManyFor", () => {
         id: "some-runnable-2",
 
         instantiate: () => ({
+          id: "some-runnable-2",
           run: (parameter) => runMock("run-of-some-runnable-2", parameter),
         }),
 
diff --git a/src/common/runnable/run-many-for.ts b/src/common/runnable/run-many-for.ts
index f2c1a4ae56..ce3123c0b0 100644
--- a/src/common/runnable/run-many-for.ts
+++ b/src/common/runnable/run-many-for.ts
@@ -2,50 +2,47 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { pipeline } from "@ogre-tools/fp";
-import type {
-  DiContainerForInjection,
-  InjectionToken,
-} from "@ogre-tools/injectable";
-import { filter, forEach, map, tap } from "lodash/fp";
-import { throwWithIncorrectHierarchyFor } from "./throw-with-incorrect-hierarchy-for";
+import type { DiContainerForInjection, InjectionToken } from "@ogre-tools/injectable";
+import type { Composite } from "../utils/composite/get-composite/get-composite";
+import { getCompositeFor } from "../utils/composite/get-composite/get-composite";
+import * as uuid from "uuid";
 
 export interface Runnable<TParameter = void> {
+  id: string;
   run: Run<TParameter>;
-  runAfter?: this;
+  runAfter?: Runnable<TParameter>;
 }
 
 type Run<Param> = (parameter: Param) => Promise<void> | void;
 
-export type RunMany = <Param>(
-  injectionToken: InjectionToken<Runnable<Param>, void>
-) => Run<Param>;
+export type RunMany = <Param>(injectionToken: InjectionToken<Runnable<Param>, void>) => Run<Param>;
+
+async function runCompositeRunnables<Param>(param: Param, composite: Composite<Runnable<Param>>) {
+  await composite.value.run(param);
+  await Promise.all(composite.children.map(composite => runCompositeRunnables(param, composite)));
+}
 
 export function runManyFor(di: DiContainerForInjection): RunMany {
-  return (injectionToken) => async (parameter) => {
+  return <Param>(injectionToken: InjectionToken<Runnable<Param>, void>) => async (param: Param) => {
     const allRunnables = di.injectMany(injectionToken);
+    const rootId = uuid.v4();
+    const getCompositeRunnables = getCompositeFor<Runnable<Param>>({
+      getId: (runnable) => runnable.id,
+      getParentId: (runnable) => (
+        runnable.id === rootId
+          ? undefined
+          : runnable.runAfter?.id ?? rootId
+      ),
+    });
+    const composite = getCompositeRunnables([
+      // This is a dummy runnable to conform to the requirements of `getCompositeFor` to only have one root
+      {
+        id: rootId,
+        run: () => {},
+      },
+      ...allRunnables,
+    ]);
 
-    const throwWithIncorrectHierarchy = throwWithIncorrectHierarchyFor(allRunnables);
-
-    const recursedRun = async (
-      runAfterRunnable: Runnable<any> | undefined = undefined,
-    ) =>
-      await pipeline(
-        allRunnables,
-
-        tap(runnables => forEach(throwWithIncorrectHierarchy, runnables)),
-
-        filter((runnable) => runnable.runAfter === runAfterRunnable),
-
-        map(async (runnable) => {
-          await runnable.run(parameter);
-
-          await recursedRun(runnable);
-        }),
-
-        (promises) => Promise.all(promises),
-      );
-
-    await recursedRun();
+    await runCompositeRunnables(param, composite);
   };
 }
diff --git a/src/common/runnable/run-many-sync-for.test.ts b/src/common/runnable/run-many-sync-for.test.ts
index fe47516725..3aadcad0bf 100644
--- a/src/common/runnable/run-many-sync-for.test.ts
+++ b/src/common/runnable/run-many-sync-for.test.ts
@@ -21,13 +21,19 @@ describe("runManySyncFor", () => {
 
       const someInjectable = getInjectable({
         id: "some-injectable",
-        instantiate: () => ({ run: () => runMock("some-call") }),
+        instantiate: () => ({
+          id: "some-injectable",
+          run: () => runMock("some-call"),
+        }),
         injectionToken: someInjectionTokenForRunnables,
       });
 
       const someOtherInjectable = getInjectable({
         id: "some-other-injectable",
-        instantiate: () => ({ run: () => runMock("some-other-call") }),
+        instantiate: () => ({
+          id: "some-other-injectable",
+          run: () => runMock("some-other-call"),
+        }),
         injectionToken: someInjectionTokenForRunnables,
       });
 
@@ -62,7 +68,8 @@ describe("runManySyncFor", () => {
         id: "some-injectable-1",
 
         instantiate: (di) => ({
-          run: () => runMock("third-level-run"),
+          id: "some-injectable-1",
+          run: () => void runMock("third-level-run"),
           runAfter: di.inject(someInjectable2),
         }),
 
@@ -73,7 +80,8 @@ describe("runManySyncFor", () => {
         id: "some-injectable-2",
 
         instantiate: (di) => ({
-          run: () => runMock("second-level-run"),
+          id: "some-injectable-2",
+          run: () => void runMock("second-level-run"),
           runAfter: di.inject(someInjectable3),
         }),
 
@@ -82,7 +90,10 @@ describe("runManySyncFor", () => {
 
       const someInjectable3 = getInjectable({
         id: "some-injectable-3",
-        instantiate: () => ({ run: () => runMock("first-level-run") }),
+        instantiate: () => ({
+          id: "some-injectable-3",
+          run: () => void runMock("first-level-run"),
+        }),
         injectionToken: someInjectionTokenForRunnables,
       });
 
@@ -115,6 +126,7 @@ describe("runManySyncFor", () => {
       id: "some-runnable-1",
 
       instantiate: (di) => ({
+        id: "some-runnable-1",
         run: () => runMock("some-runnable-1"),
         runAfter: di.inject(someOtherInjectable),
       }),
@@ -126,6 +138,7 @@ describe("runManySyncFor", () => {
       id: "some-runnable-2",
 
       instantiate: () => ({
+        id: "some-runnable-2",
         run: () => runMock("some-runnable-2"),
       }),
 
@@ -138,13 +151,13 @@ describe("runManySyncFor", () => {
       someInjectionToken,
     );
 
-    return expect(() => runMany()).rejects.toThrow(
-      "Tried to run runnable after other runnable which does not same injection token.",
+    return expect(() => runMany()).toThrow(
+      /Tried to get a composite but encountered missing parent ids: "some-runnable-2".\n\nAvailable parent ids are:\n"[0-9a-z-]+",\n"some-runnable-1"/,
     );
   });
 
   describe("when running many with parameter", () => {
-    let runMock: jest.Mock<(arg: string, arg2: string) => void>;
+    let runMock: jest.Mock<(arg: string, arg2: string) => undefined>;
 
     beforeEach(() => {
       const rootDi = createContainer("irrelevant");
@@ -161,7 +174,8 @@ describe("runManySyncFor", () => {
         id: "some-runnable-1",
 
         instantiate: () => ({
-          run: (parameter) => runMock("run-of-some-runnable-1", parameter),
+          id: "some-runnable-1",
+          run: (parameter) => void runMock("run-of-some-runnable-1", parameter),
         }),
 
         injectionToken: someInjectionTokenForRunnablesWithParameter,
@@ -171,7 +185,8 @@ describe("runManySyncFor", () => {
         id: "some-runnable-2",
 
         instantiate: () => ({
-          run: (parameter) => runMock("run-of-some-runnable-2", parameter),
+          id: "some-runnable-2",
+          run: (parameter) => void runMock("run-of-some-runnable-2", parameter),
         }),
 
         injectionToken: someInjectionTokenForRunnablesWithParameter,
diff --git a/src/common/runnable/run-many-sync-for.ts b/src/common/runnable/run-many-sync-for.ts
index cfe93fa4b3..08dba2f72d 100644
--- a/src/common/runnable/run-many-sync-for.ts
+++ b/src/common/runnable/run-many-sync-for.ts
@@ -2,49 +2,54 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { pipeline } from "@ogre-tools/fp";
-import type {
-  DiContainerForInjection,
-  InjectionToken,
-} from "@ogre-tools/injectable";
-import { filter, forEach, map, tap } from "lodash/fp";
-import type { Runnable } from "./run-many-for";
-import { throwWithIncorrectHierarchyFor } from "./throw-with-incorrect-hierarchy-for";
+import type { DiContainerForInjection, InjectionToken } from "@ogre-tools/injectable";
+import type { Composite } from "../utils/composite/get-composite/get-composite";
+import { getCompositeFor } from "../utils/composite/get-composite/get-composite";
+import * as uuid from "uuid";
 
 export interface RunnableSync<TParameter = void> {
+  id: string;
   run: RunSync<TParameter>;
-  runAfter?: this;
+  runAfter?: RunnableSync<TParameter>;
 }
 
-type RunSync<Param> = (parameter: Param) => void;
+/**
+ * NOTE: this is the worse of two evils. This makes sure that `RunnableSync` always is sync.
+ * If the return type is `void` instead then async functions (those return `Promise<T>`) can
+ * coerce to it.
+ */
+type RunSync<Param> = (parameter: Param) => undefined;
 
-export type RunManySync = <Param>(
-  injectionToken: InjectionToken<Runnable<Param>, void>
-) => RunSync<Param>;
+export type RunManySync = <Param>(injectionToken: InjectionToken<RunnableSync<Param>, void>) => RunSync<Param>;
+
+function runCompositeRunnableSyncs<Param>(param: Param, composite: Composite<RunnableSync<Param>>): undefined {
+  composite.value.run(param);
+  composite.children.map(composite => runCompositeRunnableSyncs(param, composite));
+
+  return undefined;
+}
 
 export function runManySyncFor(di: DiContainerForInjection): RunManySync {
-  return (injectionToken) => async (parameter) => {
+  return <Param>(injectionToken: InjectionToken<RunnableSync<Param>, void>) => (param: Param): undefined => {
     const allRunnables = di.injectMany(injectionToken);
+    const rootId = uuid.v4();
+    const getCompositeRunnables = getCompositeFor<RunnableSync<Param>>({
+      getId: (runnable) => runnable.id,
+      getParentId: (runnable) => (
+        runnable.id === rootId
+          ? undefined
+          : runnable.runAfter?.id ?? rootId
+      ),
+    });
+    const composite = getCompositeRunnables([
+      // This is a dummy runnable to conform to the requirements of `getCompositeFor` to only have one root
+      {
+        id: rootId,
+        run: () => undefined,
+      },
+      ...allRunnables,
+    ]);
 
-    const throwWithIncorrectHierarchy = throwWithIncorrectHierarchyFor(allRunnables);
-
-    const recursedRun = (
-      runAfterRunnable: RunnableSync<any> | undefined = undefined,
-    ) =>
-      pipeline(
-        allRunnables,
-
-        tap(runnables => forEach(throwWithIncorrectHierarchy, runnables)),
-
-        filter((runnable) => runnable.runAfter === runAfterRunnable),
-
-        map((runnable) => {
-          runnable.run(parameter);
-
-          recursedRun(runnable);
-        }),
-      );
-
-    recursedRun();
+    return runCompositeRunnableSyncs(param, composite);
   };
 }
diff --git a/src/common/runnable/throw-with-incorrect-hierarchy-for.ts b/src/common/runnable/throw-with-incorrect-hierarchy-for.ts
deleted file mode 100644
index 03073c4044..0000000000
--- a/src/common/runnable/throw-with-incorrect-hierarchy-for.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import type { Runnable } from "./run-many-for";
-import type { RunnableSync } from "./run-many-sync-for";
-
-export const throwWithIncorrectHierarchyFor =
-  (allRunnables: Runnable<any>[] | RunnableSync<any>[]) =>
-    (runnable: Runnable<any> | RunnableSync<any>) => {
-      if (runnable.runAfter && !allRunnables.includes(runnable.runAfter)) {
-        throw new Error(
-          "Tried to run runnable after other runnable which does not same injection token.",
-        );
-      }
-    };
diff --git a/src/common/sentry.ts b/src/common/sentry.ts
deleted file mode 100644
index 282afa6f32..0000000000
--- a/src/common/sentry.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { Dedupe, Offline } from "@sentry/integrations";
-import { sentryDsn, isProduction } from "./vars";
-import { UserStore } from "./user-store";
-import { inspect } from "util";
-import type { BrowserOptions } from "@sentry/electron/renderer";
-import type { ElectronMainOptions } from "@sentry/electron/main";
-
-/**
- * "Translate" 'browser' to 'main' as Lens developer more familiar with the term 'main'
- */
-function mapProcessName(processType: string) {
-  if (processType === "browser") {
-    return "main";
-  }
-
-  return processType;
-}
-
-/**
- * Initialize Sentry for the current process so to send errors for debugging.
- */
-export function initializeSentryReporting(init: (opts: BrowserOptions | ElectronMainOptions) => void) {
-  const processName = mapProcessName(process.type);
-
-  if (!sentryDsn) {
-    return; // do nothing if not configured to avoid uncaught error in dev mode
-  }
-
-  init({
-    beforeSend: (event) => {
-      // default to false, in case instance of UserStore is not created (yet)
-      const allowErrorReporting = UserStore.getInstance(false)?.allowErrorReporting ?? false;
-
-      if (allowErrorReporting) {
-        return event;
-      }
-
-      /**
-       * Directly write to stdout so that no other integrations capture this and create an infinite loop
-       */
-      process.stdout.write(`🔒  [SENTRY-BEFORE-SEND-HOOK]: allowErrorReporting: ${allowErrorReporting}. Sentry event is caught but not sent to server.`);
-      process.stdout.write("🔒  [SENTRY-BEFORE-SEND-HOOK]: === START OF SENTRY EVENT ===");
-      process.stdout.write(inspect(event, false, null, true));
-      process.stdout.write("🔒  [SENTRY-BEFORE-SEND-HOOK]: ===  END OF SENTRY EVENT  ===");
-
-      // if return null, the event won't be sent
-      // ref https://github.com/getsentry/sentry-javascript/issues/2039
-      return null;
-    },
-    dsn: sentryDsn,
-    integrations: [
-      new Dedupe(),
-      new Offline(),
-    ],
-    initialScope: {
-      tags: {
-        "process": processName,
-      },
-    },
-    environment: isProduction ? "production" : "development",
-  });
-}
diff --git a/src/common/system-ca.ts b/src/common/system-ca.ts
deleted file mode 100644
index 4e57ca2d7b..0000000000
--- a/src/common/system-ca.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { isMac, isWindows } from "./vars";
-import wincaAPI from "win-ca/api";
-import https from "https";
-import { promiseExecFile } from "./utils/promise-exec";
-
-// DST Root CA X3, which was expired on 9.30.2021
-export const DSTRootCAX3 = "-----BEGIN CERTIFICATE-----\nMIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/\nMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT\nDkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow\nPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD\nEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB\nAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O\nrz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq\nOLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b\nxiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw\n7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD\naeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV\nHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG\nSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69\nikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr\nAvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz\nR8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5\nJDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo\nOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ\n-----END CERTIFICATE-----\n";
-
-export function isCertActive(cert: string) {
-  const isExpired = typeof cert !== "string" || cert.includes(DSTRootCAX3);
-
-  return !isExpired;
-}
-
-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Cheatsheet#other_assertions
-const certSplitPattern = /(?=-----BEGIN\sCERTIFICATE-----)/g;
-
-async function execSecurity(...args: string[]): Promise<string[]> {
-  const { stdout } = await promiseExecFile("/usr/bin/security", args);
-
-  return stdout.split(certSplitPattern);
-}
-
-/**
- * Get root CA certificate from MacOSX system keychain
- * Only return non-expred certificates.
- */
-export async function getMacRootCA() {
-  // inspired mac-ca https://github.com/jfromaniello/mac-ca
-  const [trusted, rootCA] = await Promise.all([
-    execSecurity("find-certificate", "-a", "-p"),
-    execSecurity("find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain"),
-  ]);
-
-  return [...new Set([...trusted, ...rootCA])].filter(isCertActive);
-}
-
-/**
- * Get root CA certificate from Windows system certificate store.
- * Only return non-expred certificates.
- */
-export function getWinRootCA(): Promise<string[]> {
-  return new Promise((resolve) => {
-    const CAs: string[] = [];
-
-    wincaAPI({
-      format: wincaAPI.der2.pem,
-      inject: false,
-      ondata: (ca: string) => {
-        CAs.push(ca);
-      },
-      onend: () => {
-        resolve(CAs.filter(isCertActive));
-      },
-    });
-  });
-}
-
-
-/**
- * Add (or merge) CAs to https.globalAgent.options.ca
- */
-export function injectCAs(CAs: string[]) {
-  for (const cert of CAs) {
-    if (Array.isArray(https.globalAgent.options.ca) && !https.globalAgent.options.ca.includes(cert)) {
-      https.globalAgent.options.ca.push(cert);
-    } else {
-      https.globalAgent.options.ca = [cert];
-    }
-  }
-}
-
-/**
- * Inject CAs found in OS's (Windoes/MacOSX only) root certificate store to https.globalAgent.options.ca
- */
-export async function injectSystemCAs() {
-  if (isMac) {
-    try {
-      const osxRootCAs = await getMacRootCA();
-
-      injectCAs(osxRootCAs);
-    } catch (error) {
-      console.warn(`[MAC-CA]: Error injecting root CAs from MacOSX. ${error}`);
-    }
-  }
-
-  if (isWindows) {
-    try {
-      const winRootCAs = await getWinRootCA();
-
-      wincaAPI.inject("+", winRootCAs);
-
-    } catch (error) {
-      console.warn(`[WIN-CA]: Error injecting root CAs from Windows. ${error}`);
-    }
-  }
-}
diff --git a/src/common/test-utils/get-absolute-path-fake.ts b/src/common/test-utils/get-absolute-path-fake.ts
deleted file mode 100644
index 89b5faa446..0000000000
--- a/src/common/test-utils/get-absolute-path-fake.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import type { GetAbsolutePath } from "../path/get-absolute-path.injectable";
-
-export const getAbsolutePathFake: GetAbsolutePath = (...args) => {
-  const maybeAbsolutePath = args.join("/");
-
-  if (isAbsolutePath(maybeAbsolutePath)) {
-    return maybeAbsolutePath;
-  }
-
-  return `/some-absolute-root-directory/${maybeAbsolutePath}`;
-};
-
-const isAbsolutePath = (path: string) => path.startsWith("/");
diff --git a/src/common/test-utils/get-global-override-for-function.ts b/src/common/test-utils/get-global-override-for-function.ts
new file mode 100644
index 0000000000..238ee5621a
--- /dev/null
+++ b/src/common/test-utils/get-global-override-for-function.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { Injectable } from "@ogre-tools/injectable";
+import { getGlobalOverride } from "./get-global-override";
+import { camelCase } from "lodash/fp";
+
+export const getGlobalOverrideForFunction = (
+  injectable: Injectable<Function, any, any>,
+) =>
+  getGlobalOverride(injectable, () => (...args: any[]) => {
+    console.warn(
+      `Tried to invoke a function "${injectable.id}" without override. The args were:`,
+      args,
+    );
+
+    throw new Error(
+      `Tried to invoke a function "${
+        injectable.id
+      }" without override. Add eg. "di.override(${camelCase(
+        injectable.id,
+      )}Mock)" to the unit test interested in this.`,
+    );
+  });
diff --git a/src/common/test-utils/join-paths-fake.ts b/src/common/test-utils/join-paths-fake.ts
deleted file mode 100644
index 2796423d3c..0000000000
--- a/src/common/test-utils/join-paths-fake.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import type { JoinPaths } from "../path/join-paths.injectable";
-
-export const joinPathsFake: JoinPaths = (...args) => args.join("/");
diff --git a/src/common/test-utils/use-fake-time.ts b/src/common/test-utils/use-fake-time.ts
index 77cd385b4b..2a0956cebb 100644
--- a/src/common/test-utils/use-fake-time.ts
+++ b/src/common/test-utils/use-fake-time.ts
@@ -16,7 +16,7 @@ export const advanceFakeTime = (milliseconds: number) => {
   });
 };
 
-export const useFakeTime = (dateTime: string) => {
+export const useFakeTime = (dateTime = "2015-10-21T07:28:00Z") => {
   usingFakeTime = true;
 
   jest.useFakeTimers();
diff --git a/src/common/user-store/file-name-migration.global-override-for-injectable.ts b/src/common/user-store/file-name-migration.global-override-for-injectable.ts
new file mode 100644
index 0000000000..bb0ac054f3
--- /dev/null
+++ b/src/common/user-store/file-name-migration.global-override-for-injectable.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import userStoreFileNameMigrationInjectable from "./file-name-migration.injectable";
+
+export default getGlobalOverride(userStoreFileNameMigrationInjectable, () => async () => {});
diff --git a/src/common/user-store/file-name-migration.injectable.ts b/src/common/user-store/file-name-migration.injectable.ts
index 8f2dcf1e23..106f559ef0 100644
--- a/src/common/user-store/file-name-migration.injectable.ts
+++ b/src/common/user-store/file-name-migration.injectable.ts
@@ -4,32 +4,38 @@
  */
 
 import fse from "fs-extra";
-import path from "path";
 import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import { isErrnoException } from "../utils";
 import { getInjectable } from "@ogre-tools/injectable";
+import joinPathsInjectable from "../path/join-paths.injectable";
+
+export type UserStoreFileNameMigration = () => Promise<void>;
 
 const userStoreFileNameMigrationInjectable = getInjectable({
   id: "user-store-file-name-migration",
-  instantiate: (di) => {
+  instantiate: (di): UserStoreFileNameMigration => {
     const userDataPath = di.inject(directoryForUserDataInjectable);
-    const configJsonPath = path.join(userDataPath, "config.json");
-    const lensUserStoreJsonPath = path.join(userDataPath, "lens-user-store.json");
+    const joinPaths = di.inject(joinPathsInjectable);
+    const configJsonPath = joinPaths(userDataPath, "config.json");
+    const lensUserStoreJsonPath = joinPaths(userDataPath, "lens-user-store.json");
 
-    try {
-      fse.moveSync(configJsonPath, lensUserStoreJsonPath);
-    } catch (error) {
-      if (error instanceof Error && error.message === "dest already exists.") {
-        fse.removeSync(configJsonPath);
-      } else if (isErrnoException(error) && error.code === "ENOENT" && error.path === configJsonPath) {
-        // (No such file or directory)
-        return; // file already moved
-      } else {
-        // pass other errors along
-        throw error;
+    return async () => {
+      try {
+        await fse.move(configJsonPath, lensUserStoreJsonPath);
+      } catch (error) {
+        if (error instanceof Error && error.message === "dest already exists.") {
+          await fse.remove(configJsonPath);
+        } else if (isErrnoException(error) && error.code === "ENOENT" && error.path === configJsonPath) {
+          // (No such file or directory)
+          return; // file already moved
+        } else {
+          // pass other errors along
+          throw error;
+        }
       }
-    }
+    };
   },
+  causesSideEffects: true,
 });
 
 export default userStoreFileNameMigrationInjectable;
diff --git a/src/common/user-store/kubeconfig-syncs.injectable.ts b/src/common/user-store/kubeconfig-syncs.injectable.ts
new file mode 100644
index 0000000000..bbe02fffad
--- /dev/null
+++ b/src/common/user-store/kubeconfig-syncs.injectable.ts
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import userStoreInjectable from "./user-store.injectable";
+
+const kubeconfigSyncsInjectable = getInjectable({
+  id: "kubeconfig-syncs",
+  instantiate: (di) => {
+    const store = di.inject(userStoreInjectable);
+
+    return store.syncKubeconfigEntries;
+  },
+});
+
+export default kubeconfigSyncsInjectable;
diff --git a/src/common/user-store/shell-setting.injectable.ts b/src/common/user-store/shell-setting.injectable.ts
new file mode 100644
index 0000000000..f93a4e5874
--- /dev/null
+++ b/src/common/user-store/shell-setting.injectable.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import userInfoInjectable from "./user-info.injectable";
+import userStoreInjectable from "./user-store.injectable";
+
+const userShellSettingInjectable = getInjectable({
+  id: "user-shell-setting",
+  instantiate: (di) => {
+    const userStore = di.inject(userStoreInjectable);
+    const userInfo = di.inject(userInfoInjectable);
+
+    return computed(() => userStore.shell || userInfo.shell);
+  },
+});
+
+export default userShellSettingInjectable;
diff --git a/src/common/user-store/user-info.global-override-for-injectable.ts b/src/common/user-store/user-info.global-override-for-injectable.ts
new file mode 100644
index 0000000000..21fb26f8a9
--- /dev/null
+++ b/src/common/user-store/user-info.global-override-for-injectable.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import userInfoInjectable from "./user-info.injectable";
+
+export default getGlobalOverride(userInfoInjectable, () => ({
+  gid: 1,
+  homedir: "/some-home-dir",
+  shell: "bash",
+  uid: 2,
+  username: "some-user-name",
+}));
diff --git a/src/common/user-store/user-info.injectable.ts b/src/common/user-store/user-info.injectable.ts
new file mode 100644
index 0000000000..b096da03c5
--- /dev/null
+++ b/src/common/user-store/user-info.injectable.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { userInfo } from "os";
+
+const userInfoInjectable = getInjectable({
+  id: "user-info",
+  instantiate: () => userInfo(),
+  causesSideEffects: true,
+});
+
+export default userInfoInjectable;
diff --git a/src/common/user-store/user-store.injectable.ts b/src/common/user-store/user-store.injectable.ts
index 3b4aba0b56..4e01cc50eb 100644
--- a/src/common/user-store/user-store.injectable.ts
+++ b/src/common/user-store/user-store.injectable.ts
@@ -3,10 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { ipcMain } from "electron";
-import userStoreFileNameMigrationInjectable from "./file-name-migration.injectable";
 import { UserStore } from "./user-store";
-import selectedUpdateChannelInjectable from "../application-update/selected-update-channel/selected-update-channel.injectable";
+import selectedUpdateChannelInjectable from "../../features/application-update/common/selected-update-channel/selected-update-channel.injectable";
+import emitAppEventInjectable from "../app-event-bus/emit-event.injectable";
 
 const userStoreInjectable = getInjectable({
   id: "user-store",
@@ -14,12 +13,9 @@ const userStoreInjectable = getInjectable({
   instantiate: (di) => {
     UserStore.resetInstance();
 
-    if (ipcMain) {
-      di.inject(userStoreFileNameMigrationInjectable);
-    }
-
     return UserStore.createInstance({
       selectedUpdateChannel: di.inject(selectedUpdateChannelInjectable),
+      emitAppEvent: di.inject(emitAppEventInjectable),
     });
   },
 
diff --git a/src/common/user-store/user-store.ts b/src/common/user-store/user-store.ts
index b806732735..7db6127ed8 100644
--- a/src/common/user-store/user-store.ts
+++ b/src/common/user-store/user-store.ts
@@ -4,19 +4,18 @@
  */
 
 import { app } from "electron";
-import semver from "semver";
-import { action, computed, observable, reaction, makeObservable, isObservableArray, isObservableSet, isObservableMap } from "mobx";
+import { action, observable, reaction, makeObservable, isObservableArray, isObservableSet, isObservableMap } from "mobx";
 import { BaseStore } from "../base-store";
 import migrations from "../../migrations/user-store";
-import { getAppVersion } from "../utils/app-version";
-import { kubeConfigDefaultPath } from "../kube-helpers";
-import { appEventBus } from "../app-event-bus/event-bus";
 import { getOrInsertSet, toggle, toJS, object } from "../../renderer/utils";
 import { DESCRIPTORS } from "./preferences-helpers";
 import type { UserPreferencesModel, StoreType } from "./preferences-helpers";
 import logger from "../../main/logger";
-import type { SelectedUpdateChannel } from "../application-update/selected-update-channel/selected-update-channel.injectable";
-import type { UpdateChannelId } from "../application-update/update-channels";
+import type { EmitAppEvent } from "../app-event-bus/emit-event.injectable";
+
+// TODO: Remove coupling with Feature
+import type { SelectedUpdateChannel } from "../../features/application-update/common/selected-update-channel/selected-update-channel.injectable";
+import type { ReleaseChannel } from "../../features/application-update/common/update-channels";
 
 export interface UserStoreModel {
   lastSeenAppVersion: string;
@@ -24,7 +23,8 @@ export interface UserStoreModel {
 }
 
 interface Dependencies {
-  selectedUpdateChannel: SelectedUpdateChannel;
+  readonly selectedUpdateChannel: SelectedUpdateChannel;
+  emitAppEvent: EmitAppEvent;
 }
 
 export class UserStore extends BaseStore<UserStoreModel> /* implements UserStoreFlatModel (when strict null is enabled) */ {
@@ -37,17 +37,10 @@ export class UserStore extends BaseStore<UserStoreModel> /* implements UserStore
     });
 
     makeObservable(this);
-    this.load();
   }
 
   @observable lastSeenAppVersion = "0.0.0";
 
-  /**
-   * used in add-cluster page for providing context
-   * @deprecated No longer used
-   */
-  @observable kubeConfigPath = kubeConfigDefaultPath;
-
   /**
    * @deprecated No longer used
    */
@@ -98,14 +91,6 @@ export class UserStore extends BaseStore<UserStoreModel> /* implements UserStore
    */
   @observable syncKubeconfigEntries!: StoreType<typeof DESCRIPTORS["syncKubeconfigEntries"]>;
 
-  @computed get isNewVersion() {
-    return semver.gt(getAppVersion(), this.lastSeenAppVersion);
-  }
-
-  @computed get resolvedShell(): string | undefined {
-    return this.shell || process.env.SHELL || process.env.PTYSHELL;
-  }
-
   startMainReactions() {
     // open at system start-up
     reaction(() => this.openAtLogin, openAtLogin => {
@@ -151,12 +136,6 @@ export class UserStore extends BaseStore<UserStoreModel> /* implements UserStore
     this.colorTheme = DESCRIPTORS.colorTheme.fromStore(undefined);
   }
 
-  @action
-  saveLastSeenAppVersion() {
-    appEventBus.emit({ name: "app", action: "whats-new-seen" });
-    this.lastSeenAppVersion = getAppVersion();
-  }
-
   @action
   protected fromStore({ lastSeenAppVersion, preferences }: Partial<UserStoreModel> = {}) {
     logger.debug("UserStore.fromStore()", { lastSeenAppVersion, preferences });
@@ -180,7 +159,7 @@ export class UserStore extends BaseStore<UserStoreModel> /* implements UserStore
 
     // TODO: Switch to action-based saving instead saving stores by reaction
     if (preferences?.updateChannel) {
-      this.dependencies.selectedUpdateChannel.setValue(preferences?.updateChannel as UpdateChannelId);
+      this.dependencies.selectedUpdateChannel.setValue(preferences?.updateChannel as ReleaseChannel);
     }
   }
 
diff --git a/src/common/utils/__tests__/paths.test.ts b/src/common/utils/__tests__/paths.test.ts
index f5e8a7ccf5..5a52843432 100644
--- a/src/common/utils/__tests__/paths.test.ts
+++ b/src/common/utils/__tests__/paths.test.ts
@@ -3,12 +3,29 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { describeIf } from "../../../../integration/helpers/utils";
-import { isWindows } from "../../vars";
-import { isLogicalChildPath } from "../paths";
+import type { DiContainer } from "@ogre-tools/injectable";
+import path from "path";
+import { getDiForUnitTesting } from "../../../main/getDiForUnitTesting";
+import getAbsolutePathInjectable from "../../path/get-absolute-path.injectable";
+import getDirnameOfPathInjectable from "../../path/get-dirname.injectable";
+import type { IsLogicalChildPath } from "../../path/is-logical-child-path.injectable";
+import isLogicalChildPathInjectable from "../../path/is-logical-child-path.injectable";
 
 describe("isLogicalChildPath", () => {
-  describeIf(isWindows)("windows tests", () => {
+  let di: DiContainer;
+  let isLogicalChildPath: IsLogicalChildPath;
+
+  beforeEach(() => {
+    di = getDiForUnitTesting();
+  });
+
+  describe("when using win32 paths", () => {
+    beforeEach(() => {
+      di.override(getAbsolutePathInjectable, () => path.win32.resolve);
+      di.override(getDirnameOfPathInjectable, () => path.win32.dirname);
+      isLogicalChildPath = di.inject(isLogicalChildPathInjectable);
+    });
+
     it.each([
       {
         parentPath: "C:\\Foo",
@@ -40,7 +57,13 @@ describe("isLogicalChildPath", () => {
     });
   });
 
-  describeIf(!isWindows)("posix tests", () => {
+  describe("when using posix paths", () => {
+    beforeEach(() => {
+      di.override(getAbsolutePathInjectable, () => path.posix.resolve);
+      di.override(getDirnameOfPathInjectable, () => path.posix.dirname);
+      isLogicalChildPath = di.inject(isLogicalChildPathInjectable);
+    });
+
     it.each([
       {
         parentPath: "/foo",
diff --git a/src/common/utils/abort-controller.ts b/src/common/utils/abort-controller.ts
index 8172e6a81a..b062fce487 100644
--- a/src/common/utils/abort-controller.ts
+++ b/src/common/utils/abort-controller.ts
@@ -18,3 +18,9 @@ export class WrappedAbortController extends AbortController {
     });
   }
 }
+
+export function setTimeoutFor(controller: AbortController, timeout: number): void {
+  const handle = setTimeout(() => controller.abort(), timeout);
+
+  controller.signal.addEventListener("abort", () => clearTimeout(handle));
+}
diff --git a/src/common/utils/add-separator/add-separator.test.ts b/src/common/utils/add-separator/add-separator.test.ts
new file mode 100644
index 0000000000..8a45b45739
--- /dev/null
+++ b/src/common/utils/add-separator/add-separator.test.ts
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { addSeparator } from "./add-separator";
+
+describe("add-separator", () => {
+  it("given multiple items, adds separators", () => {
+    const items = ["first", "second", "third"];
+
+    const actual = addSeparator((left, right) => `separator-between-${left}-and-${right}`, items);
+
+    expect(actual).toEqual([
+      "first",
+      "separator-between-first-and-second",
+      "second",
+      "separator-between-second-and-third",
+      "third",
+    ]);
+  });
+
+  it("given multiple items including falsy ones, adds separators", () => {
+    const items = [false, undefined, null, NaN];
+
+    const actual = addSeparator((left, right) => `separator-between-${left}-and-${right}`, items);
+
+    expect(actual).toEqual([
+      false,
+      "separator-between-false-and-undefined",
+      undefined,
+      "separator-between-undefined-and-null",
+      null,
+      "separator-between-null-and-NaN",
+      NaN,
+    ]);
+  });
+
+  it("given no items, does not add separator", () => {
+    const items: any[] = [];
+
+    const actual = addSeparator(() => "separator", items);
+
+    expect(actual).toEqual([]);
+  });
+
+  it("given one item, does not add separator", () => {
+    const items = ["first"];
+
+    const actual = addSeparator(() => "separator", items);
+
+    expect(actual).toEqual(["first"]);
+  });
+});
diff --git a/src/common/utils/add-separator/add-separator.ts b/src/common/utils/add-separator/add-separator.ts
new file mode 100644
index 0000000000..6fd6b14642
--- /dev/null
+++ b/src/common/utils/add-separator/add-separator.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+export type GetSeparator<Item, Separator> = (left: Item, right: Item) => Separator;
+
+export const addSeparator = <Item, Separator>(
+  getSeparator: GetSeparator<Item, Separator>,
+  items: Item[],
+) => items.flatMap(toSeparatedTupleUsing(getSeparator));
+
+const toSeparatedTupleUsing =
+  <Item, Separator>(getSeparator: GetSeparator<Item, Separator>) =>
+    (leftItem: Item, index: number, arr: Item[]) => {
+      const itemIsLast = arr.length === index + 1;
+
+      if (itemIsLast) {
+        return [leftItem];
+      }
+
+      const rightItem = arr[index + 1];
+      const separator = getSeparator(leftItem, rightItem);
+
+      return [leftItem, separator];
+    };
diff --git a/src/common/utils/app-version.ts b/src/common/utils/app-version.ts
index 28882e092b..183cc3e6b2 100644
--- a/src/common/utils/app-version.ts
+++ b/src/common/utils/app-version.ts
@@ -4,15 +4,6 @@
  */
 
 import requestPromise from "request-promise-native";
-import packageInfo from "../../../package.json";
-
-export function getAppVersion(): string {
-  return packageInfo.version;
-}
-
-export function getBundledKubectlVersion(): string {
-  return packageInfo.config.bundledKubectlVersion;
-}
 
 export async function getAppVersionFromProxyServer(proxyPort: number): Promise<string> {
   const response = await requestPromise({
diff --git a/src/common/utils/async-result.ts b/src/common/utils/async-result.ts
index 4e4f37866e..69927f3275 100644
--- a/src/common/utils/async-result.ts
+++ b/src/common/utils/async-result.ts
@@ -3,5 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 export type AsyncResult<Response, Error = string> =
-  | { callWasSuccessful: true; response: Response }
+  | (
+    Response extends void
+    ? { callWasSuccessful: true; response?: undefined }
+    : { callWasSuccessful: true; response: Response }
+  )
   | { callWasSuccessful: false; error: Error };
diff --git a/src/common/utils/binary-name.injectable.ts b/src/common/utils/binary-name.injectable.ts
new file mode 100644
index 0000000000..d240b3aae0
--- /dev/null
+++ b/src/common/utils/binary-name.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import normalizedPlatformInjectable from "../vars/normalized-platform.injectable";
+
+const binaryNameInjectable = getInjectable({
+  id: "binary-name",
+  instantiate: (di, binaryName) => {
+    const normalizedPlatform = di.inject(normalizedPlatformInjectable);
+
+    if (normalizedPlatform === "windows") {
+      return `${binaryName}.exe`;
+    }
+
+    return binaryName;
+  },
+  lifecycle: lifecycleEnum.keyedSingleton({
+    getInstanceKey: (di, binaryName: string) => binaryName,
+  }),
+});
+
+export default binaryNameInjectable;
diff --git a/src/common/utils/buildUrl.ts b/src/common/utils/buildUrl.ts
index 61639cea4d..82d114cd08 100644
--- a/src/common/utils/buildUrl.ts
+++ b/src/common/utils/buildUrl.ts
@@ -35,3 +35,24 @@ export function buildURLPositional<P extends object = {}, Q extends object = {}>
     return buildURL(path, { params, query, fragment });
   };
 }
+
+export type UrlParamsFor<Pathname extends string> =
+  Pathname extends `${string}/:${infer A}?/${infer Tail}`
+    ? Partial<Record<A, string>> & UrlParamsFor<`/${Tail}`>
+    : Pathname extends `${string}/:${infer A}/${infer Tail}`
+      ? Record<A, string> & UrlParamsFor<`/${Tail}`>
+      : Pathname extends `${string}/:${infer A}?`
+        ? Partial<Record<A, string>>
+        : Pathname extends `${string}/:${infer A}`
+          ? Record<A, string>
+          : {};
+
+export interface UrlBuilder<Pathname extends string> {
+  compile(params: UrlParamsFor<Pathname>, query?: object, fragment?: string): string;
+}
+
+export function urlBuilderFor<Pathname extends string>(pathname: Pathname): UrlBuilder<Pathname> {
+  return {
+    compile: buildURLPositional(pathname),
+  };
+}
diff --git a/src/common/utils/bundled-binary-path.injectable.ts b/src/common/utils/bundled-binary-path.injectable.ts
new file mode 100644
index 0000000000..42ecbca0d9
--- /dev/null
+++ b/src/common/utils/bundled-binary-path.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import joinPathsInjectable from "../path/join-paths.injectable";
+import baseBundledBinariesDirectoryInjectable from "../vars/base-bundled-binaries-dir.injectable";
+import binaryNameInjectable from "./binary-name.injectable";
+
+const bundledBinaryPathInjectable = getInjectable({
+  id: "bundled-binary-path",
+  instantiate: (di, name) => {
+    const joinPaths = di.inject(joinPathsInjectable);
+    const binaryName = di.inject(binaryNameInjectable, name);
+    const baseBundledBinariesDirectory = di.inject(baseBundledBinariesDirectoryInjectable);
+
+    return joinPaths(baseBundledBinariesDirectory, binaryName);
+  },
+  lifecycle: lifecycleEnum.keyedSingleton({
+    getInstanceKey: (di, binaryName: string) => binaryName,
+  }),
+});
+
+export default bundledBinaryPathInjectable;
diff --git a/src/common/utils/camelCase.ts b/src/common/utils/camelCase.ts
index 3ef727a2e5..a37e4c7f5c 100644
--- a/src/common/utils/camelCase.ts
+++ b/src/common/utils/camelCase.ts
@@ -6,7 +6,8 @@
 // Convert object's keys to camelCase format
 import { camelCase } from "lodash";
 import type { SingleOrMany } from "./types";
-import { isObject } from "./type-narrowing";
+import { isObject, isString } from "./type-narrowing";
+import * as object from "./objects";
 
 export function toCamelCase<T extends Record<string, unknown>[]>(obj: T): T;
 export function toCamelCase<T extends Record<string, unknown>>(obj: T): T;
@@ -17,11 +18,10 @@ export function toCamelCase(obj: SingleOrMany<Record<string, unknown> | unknown>
   }
 
   if (isObject(obj)) {
-    return Object.fromEntries(
-      Object.entries(obj)
-        .map(([key, value]) => {
-          return [camelCase(key), toCamelCase(value)];
-        }),
+    return object.fromEntries(
+      object.entries(obj)
+        .filter((pair): pair is [string, unknown] => isString(pair[0]))
+        .map(([key, value]) => [camelCase(key), isObject(value) ? toCamelCase(value) : value]),
     );
   }
 
diff --git a/src/common/utils/channel/channel.test.ts b/src/common/utils/channel/channel.test.ts
index c5f52c0874..9a361b6770 100644
--- a/src/common/utils/channel/channel.test.ts
+++ b/src/common/utils/channel/channel.test.ts
@@ -4,31 +4,31 @@
  */
 import type { DiContainer } from "@ogre-tools/injectable";
 import { getInjectable } from "@ogre-tools/injectable";
-import type { MessageToChannel } from "./message-to-channel-injection-token";
-import { messageToChannelInjectionToken } from "./message-to-channel-injection-token";
+import type { SendMessageToChannel } from "./message-to-channel-injection-token";
+import { sendMessageToChannelInjectionToken } from "./message-to-channel-injection-token";
 import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
 import type { LensWindow } from "../../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
+import type { MessageChannel } from "./message-channel-listener-injection-token";
 import { messageChannelListenerInjectionToken } from "./message-channel-listener-injection-token";
-import type { MessageChannel } from "./message-channel-injection-token";
 import type { RequestFromChannel } from "./request-from-channel-injection-token";
 import { requestFromChannelInjectionToken } from "./request-from-channel-injection-token";
-import type { RequestChannel } from "./request-channel-injection-token";
-import { requestChannelListenerInjectionToken } from "./request-channel-listener-injection-token";
+import type { RequestChannel } from "./request-channel-listener-injection-token";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import { getPromiseStatus } from "../../test-utils/get-promise-status";
 import { runInAction } from "mobx";
+import type { RequestChannelHandler } from "../../../main/utils/channel/channel-listeners/listener-tokens";
+import { getRequestChannelListenerInjectable } from "../../../main/utils/channel/channel-listeners/listener-tokens";
 
 type TestMessageChannel = MessageChannel<string>;
 type TestRequestChannel = RequestChannel<string, string>;
 
 describe("channel", () => {
   describe("messaging from main to renderer, given listener for channel in a window and application has started", () => {
-    let testMessageChannel: TestMessageChannel;
     let messageListenerInWindowMock: jest.Mock;
     let mainDi: DiContainer;
-    let messageToChannel: MessageToChannel;
+    let messageToChannel: SendMessageToChannel;
     let builder: ApplicationBuilder;
 
     beforeEach(async () => {
@@ -39,24 +39,17 @@ describe("channel", () => {
       const testChannelListenerInTestWindowInjectable = getInjectable({
         id: "test-channel-listener-in-test-window",
 
-        instantiate: (di) => ({
-          channel: di.inject(testMessageChannelInjectable),
+        instantiate: () => ({
+          channel: testMessageChannel,
           handler: messageListenerInWindowMock,
         }),
 
         injectionToken: messageChannelListenerInjectionToken,
       });
 
-      builder.beforeApplicationStart((mainDi) => {
-        runInAction(() => {
-          mainDi.register(testMessageChannelInjectable);
-        });
-      });
-
       builder.beforeWindowStart((windowDi) => {
         runInAction(() => {
           windowDi.register(testChannelListenerInTestWindowInjectable);
-          windowDi.register(testMessageChannelInjectable);
         });
       });
 
@@ -64,8 +57,7 @@ describe("channel", () => {
 
       await builder.startHidden();
 
-      testMessageChannel = mainDi.inject(testMessageChannelInjectable);
-      messageToChannel = mainDi.inject(messageToChannelInjectionToken);
+      messageToChannel = mainDi.inject(sendMessageToChannelInjectionToken);
     });
 
     describe("given window is started", () => {
@@ -109,9 +101,8 @@ describe("channel", () => {
   });
 
   describe("messaging from renderer to main, given listener for channel in a main and application has started", () => {
-    let testMessageChannel: TestMessageChannel;
     let messageListenerInMainMock: jest.Mock;
-    let messageToChannel: MessageToChannel;
+    let messageToChannel: SendMessageToChannel;
 
     beforeEach(async () => {
       const applicationBuilder = getApplicationBuilder();
@@ -121,9 +112,8 @@ describe("channel", () => {
       const testChannelListenerInMainInjectable = getInjectable({
         id: "test-channel-listener-in-main",
 
-        instantiate: (di) => ({
-          channel: di.inject(testMessageChannelInjectable),
-
+        instantiate: () => ({
+          channel: testMessageChannel,
           handler: messageListenerInMainMock,
         }),
 
@@ -133,13 +123,6 @@ describe("channel", () => {
       applicationBuilder.beforeApplicationStart((mainDi) => {
         runInAction(() => {
           mainDi.register(testChannelListenerInMainInjectable);
-          mainDi.register(testMessageChannelInjectable);
-        });
-      });
-
-      applicationBuilder.beforeWindowStart((windowDi) => {
-        runInAction(() => {
-          windowDi.register(testMessageChannelInjectable);
         });
       });
 
@@ -147,8 +130,7 @@ describe("channel", () => {
 
       const windowDi = applicationBuilder.applicationWindow.only.di;
 
-      testMessageChannel = windowDi.inject(testMessageChannelInjectable);
-      messageToChannel = windowDi.inject(messageToChannelInjectionToken);
+      messageToChannel = windowDi.inject(sendMessageToChannelInjectionToken);
     });
 
     it("when sending message, triggers listener in main", () => {
@@ -159,8 +141,7 @@ describe("channel", () => {
   });
 
   describe("requesting from main in renderer, given listener for channel in a main and application has started", () => {
-    let testRequestChannel: TestRequestChannel;
-    let requestListenerInMainMock: AsyncFnMock<(arg: string) => string>;
+    let requestListenerInMainMock: AsyncFnMock<RequestChannelHandler<TestRequestChannel>>;
     let requestFromChannel: RequestFromChannel;
 
     beforeEach(async () => {
@@ -168,28 +149,14 @@ describe("channel", () => {
 
       requestListenerInMainMock = asyncFn();
 
-      const testChannelListenerInMainInjectable = getInjectable({
-        id: "test-channel-listener-in-main",
-
-        instantiate: (di) => ({
-          channel: di.inject(testRequestChannelInjectable),
-
-          handler: requestListenerInMainMock,
-        }),
-
-        injectionToken: requestChannelListenerInjectionToken,
+      const testChannelListenerInMainInjectable = getRequestChannelListenerInjectable({
+        channel: testRequestChannel,
+        handler: () => requestListenerInMainMock,
       });
 
       applicationBuilder.beforeApplicationStart((mainDi) => {
         runInAction(() => {
           mainDi.register(testChannelListenerInMainInjectable);
-          mainDi.register(testRequestChannelInjectable);
-        });
-      });
-
-      applicationBuilder.beforeWindowStart((windowDi) => {
-        runInAction(() => {
-          windowDi.register(testRequestChannelInjectable);
         });
       });
 
@@ -197,8 +164,6 @@ describe("channel", () => {
 
       const windowDi = applicationBuilder.applicationWindow.only.di;
 
-      testRequestChannel = windowDi.inject(testRequestChannelInjectable);
-
       requestFromChannel = windowDi.inject(
         requestFromChannelInjectionToken,
       );
@@ -230,21 +195,37 @@ describe("channel", () => {
       });
     });
   });
+
+  it("when registering multiple handlers for the same channel, throws", async () => {
+    const applicationBuilder = getApplicationBuilder();
+
+    const testChannelListenerInMainInjectable = getRequestChannelListenerInjectable({
+      channel: testRequestChannel,
+      handler: () => () => "some-value",
+    });
+    const testChannelListenerInMain2Injectable = getRequestChannelListenerInjectable({
+      channel: testRequestChannel,
+      handler: () => () => "some-other-value",
+    });
+
+    testChannelListenerInMain2Injectable.id += "2";
+
+    applicationBuilder.beforeApplicationStart((mainDi) => {
+      runInAction(() => {
+        mainDi.register(testChannelListenerInMainInjectable);
+        mainDi.register(testChannelListenerInMain2Injectable);
+      });
+    });
+
+    await expect(applicationBuilder.render()).rejects.toThrow('Tried to register a multiple channel handlers for "some-request-channel-id", only one handler is supported for a request channel.');
+  });
 });
 
-const testMessageChannelInjectable = getInjectable({
-  id: "some-message-test-channel",
+const testMessageChannel: TestMessageChannel = {
+  id: "some-message-channel-id",
+};
 
-  instantiate: (): TestMessageChannel => ({
-    id: "some-message-channel-id",
-  }),
-});
-
-const testRequestChannelInjectable = getInjectable({
-  id: "some-request-test-channel",
-
-  instantiate: (): TestRequestChannel => ({
-    id: "some-request-channel-id",
-  }),
-});
+const testRequestChannel: TestRequestChannel = {
+  id: "some-request-channel-id",
+};
 
diff --git a/src/common/utils/channel/enlist-message-channel-listener-injection-token.ts b/src/common/utils/channel/enlist-message-channel-listener-injection-token.ts
index fa6983e130..34f62d51d5 100644
--- a/src/common/utils/channel/enlist-message-channel-listener-injection-token.ts
+++ b/src/common/utils/channel/enlist-message-channel-listener-injection-token.ts
@@ -3,14 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { MessageChannel } from "./message-channel-injection-token";
-import type { MessageChannelListener } from "./message-channel-listener-injection-token";
+import type { Disposer } from "../disposer";
+import type { MessageChannel, MessageChannelListener } from "./message-channel-listener-injection-token";
 
-export type EnlistMessageChannelListener = <
-  TChannel extends MessageChannel<any>,
->(listener: MessageChannelListener<TChannel>) => () => void;
+export type EnlistMessageChannelListener = (listener: MessageChannelListener<MessageChannel<unknown>>) => Disposer;
 
-export const enlistMessageChannelListenerInjectionToken =
-  getInjectionToken<EnlistMessageChannelListener>({
-    id: "enlist-message-channel-listener",
-  });
+export const enlistMessageChannelListenerInjectionToken = getInjectionToken<EnlistMessageChannelListener>({
+  id: "enlist-message-channel-listener",
+});
diff --git a/src/common/utils/channel/enlist-request-channel-listener-injection-token.ts b/src/common/utils/channel/enlist-request-channel-listener-injection-token.ts
deleted file mode 100644
index f87082c466..0000000000
--- a/src/common/utils/channel/enlist-request-channel-listener-injection-token.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectionToken } from "@ogre-tools/injectable";
-import type { RequestChannel } from "./request-channel-injection-token";
-import type { RequestChannelListener } from "./request-channel-listener-injection-token";
-
-export type EnlistRequestChannelListener = <
-  TChannel extends RequestChannel<any, any>,
->(listener: RequestChannelListener<TChannel>) => () => void;
-
-export const enlistRequestChannelListenerInjectionToken =
-  getInjectionToken<EnlistRequestChannelListener>({
-    id: "enlist-request-channel-listener",
-  });
diff --git a/src/common/utils/channel/listening-of-channels.injectable.ts b/src/common/utils/channel/listening-of-channels.injectable.ts
deleted file mode 100644
index 30fee42fb9..0000000000
--- a/src/common/utils/channel/listening-of-channels.injectable.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { getStartableStoppable } from "../get-startable-stoppable";
-import { disposer } from "../index";
-import { messageChannelListenerInjectionToken } from "./message-channel-listener-injection-token";
-import { requestChannelListenerInjectionToken } from "./request-channel-listener-injection-token";
-import { enlistMessageChannelListenerInjectionToken } from "./enlist-message-channel-listener-injection-token";
-import { enlistRequestChannelListenerInjectionToken } from "./enlist-request-channel-listener-injection-token";
-
-const listeningOfChannelsInjectable = getInjectable({
-  id: "listening-of-channels",
-
-  instantiate: (di) => {
-    const enlistMessageChannelListener = di.inject(enlistMessageChannelListenerInjectionToken);
-    const enlistRequestChannelListener = di.inject(enlistRequestChannelListenerInjectionToken);
-    const messageChannelListeners = di.injectMany(messageChannelListenerInjectionToken);
-    const requestChannelListeners = di.injectMany(requestChannelListenerInjectionToken);
-
-    return getStartableStoppable("listening-of-channels", () => {
-      const messageChannelDisposers = messageChannelListeners.map(enlistMessageChannelListener);
-      const requestChannelDisposers = requestChannelListeners.map(enlistRequestChannelListener);
-
-      return disposer(...messageChannelDisposers, ...requestChannelDisposers);
-    });
-  },
-});
-
-
-export default listeningOfChannelsInjectable;
diff --git a/src/common/utils/channel/listening-on-message-channels.injectable.ts b/src/common/utils/channel/listening-on-message-channels.injectable.ts
new file mode 100644
index 0000000000..afe0c08f24
--- /dev/null
+++ b/src/common/utils/channel/listening-on-message-channels.injectable.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { getStartableStoppable } from "../get-startable-stoppable";
+import { disposer } from "../index";
+import { messageChannelListenerInjectionToken } from "./message-channel-listener-injection-token";
+import { enlistMessageChannelListenerInjectionToken } from "./enlist-message-channel-listener-injection-token";
+
+const listeningOnMessageChannelsInjectable = getInjectable({
+  id: "listening-on-message-channels",
+
+  instantiate: (di) => {
+    const enlistMessageChannelListener = di.inject(enlistMessageChannelListenerInjectionToken);
+    const messageChannelListeners = di.injectMany(messageChannelListenerInjectionToken);
+
+    return getStartableStoppable("listening-on-channels", () => (
+      disposer(messageChannelListeners.map(enlistMessageChannelListener))
+    ));
+  },
+});
+
+
+export default listeningOnMessageChannelsInjectable;
diff --git a/src/common/utils/channel/message-channel-injection-token.ts b/src/common/utils/channel/message-channel-injection-token.ts
deleted file mode 100644
index 3141acedf3..0000000000
--- a/src/common/utils/channel/message-channel-injection-token.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { getInjectionToken } from "@ogre-tools/injectable";
-import type { JsonValue } from "type-fest";
-
-export interface MessageChannel<Message extends JsonValue | void = void> {
-  id: string;
-  _messageSignature?: Message;
-}
-
-export const messageChannelInjectionToken = getInjectionToken<MessageChannel<any>>({
-  id: "message-channel",
-});
diff --git a/src/common/utils/channel/message-channel-listener-injection-token.ts b/src/common/utils/channel/message-channel-listener-injection-token.ts
index 8879e19013..5bfc45a82d 100644
--- a/src/common/utils/channel/message-channel-listener-injection-token.ts
+++ b/src/common/utils/channel/message-channel-listener-injection-token.ts
@@ -2,17 +2,50 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectionToken } from "@ogre-tools/injectable";
-import type { SetRequired } from "type-fest";
-import type { MessageChannel } from "./message-channel-injection-token";
+import type { DiContainerForInjection } from "@ogre-tools/injectable";
+import { getInjectable, getInjectionToken } from "@ogre-tools/injectable";
 
-export interface MessageChannelListener<TChannel extends MessageChannel<any>> {
-  channel: TChannel;
-  handler: (value: SetRequired<TChannel, "_messageSignature">["_messageSignature"]) => void;
+export interface MessageChannel<Message> {
+  id: string;
+  _messageSignature?: Message; // only used to mark `Message` as used
 }
 
-export const messageChannelListenerInjectionToken = getInjectionToken<MessageChannelListener<MessageChannel<any>>>(
+export type MessageChannelHandler<Channel> = Channel extends MessageChannel<infer Message>
+  ? (message: Message) => void
+  : never;
+
+export interface MessageChannelListener<Channel> {
+  channel: Channel;
+  handler: MessageChannelHandler<Channel>;
+}
+
+export const messageChannelListenerInjectionToken = getInjectionToken<MessageChannelListener<MessageChannel<unknown>>>(
   {
     id: "message-channel-listener",
   },
 );
+
+export interface GetMessageChannelListenerInfo<
+  Channel extends MessageChannel<Message>,
+  Message,
+> {
+  id: string;
+  channel: Channel;
+  handler: (di: DiContainerForInjection) => MessageChannelHandler<Channel>;
+  causesSideEffects?: boolean;
+}
+
+export function getMessageChannelListenerInjectable<
+  Channel extends MessageChannel<Message>,
+  Message,
+>(info: GetMessageChannelListenerInfo<Channel, Message>) {
+  return getInjectable({
+    id: `${info.channel.id}-listener-${info.id}`,
+    instantiate: (di) => ({
+      channel: info.channel,
+      handler: info.handler(di),
+    }),
+    injectionToken: messageChannelListenerInjectionToken,
+    causesSideEffects: info.causesSideEffects,
+  });
+}
diff --git a/src/common/utils/channel/message-to-channel-injection-token.ts b/src/common/utils/channel/message-to-channel-injection-token.ts
index 8c5f03b9ee..3ffd75f4f7 100644
--- a/src/common/utils/channel/message-to-channel-injection-token.ts
+++ b/src/common/utils/channel/message-to-channel-injection-token.ts
@@ -3,21 +3,19 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { SetRequired } from "type-fest";
-import type { MessageChannel } from "./message-channel-injection-token";
+import type { MessageChannel } from "./message-channel-listener-injection-token";
 
-export interface MessageToChannel {
-  <TChannel extends MessageChannel<TMessage>, TMessage extends void>(
-    channel: TChannel,
-  ): void;
-
-  <TChannel extends MessageChannel<any>>(
-    channel: TChannel,
-    message: SetRequired<TChannel, "_messageSignature">["_messageSignature"],
-  ): void;
+export interface SendMessageToChannel {
+  (channel: MessageChannel<void>): void;
+  <Message>(channel: MessageChannel<Message>, message: Message): void;
 }
 
-export const messageToChannelInjectionToken =
-  getInjectionToken<MessageToChannel>({
-    id: "message-to-message-channel",
-  });
+export type MessageChannelSender<Channel> = Channel extends MessageChannel<void | undefined>
+  ? () => void
+  : Channel extends MessageChannel<infer Message>
+    ? (message: Message) => void
+    : never;
+
+export const sendMessageToChannelInjectionToken = getInjectionToken<SendMessageToChannel>({
+  id: "send-message-to-message-channel",
+});
diff --git a/src/common/utils/channel/request-channel-injection-token.ts b/src/common/utils/channel/request-channel-injection-token.ts
deleted file mode 100644
index 67044db878..0000000000
--- a/src/common/utils/channel/request-channel-injection-token.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { getInjectionToken } from "@ogre-tools/injectable";
-import type { JsonValue } from "type-fest";
-
-export interface RequestChannel<
-  Request extends JsonValue | void = void,
-  Response extends JsonValue | void = void,
-> {
-  id: string;
-  _requestSignature?: Request;
-  _responseSignature?: Response;
-}
-
-export const requestChannelInjectionToken = getInjectionToken<RequestChannel<any, any>>({
-  id: "request-channel",
-});
diff --git a/src/common/utils/channel/request-channel-listener-injection-token.ts b/src/common/utils/channel/request-channel-listener-injection-token.ts
index 690b96d9dc..2f0b84a3cc 100644
--- a/src/common/utils/channel/request-channel-listener-injection-token.ts
+++ b/src/common/utils/channel/request-channel-listener-injection-token.ts
@@ -2,24 +2,9 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectionToken } from "@ogre-tools/injectable";
-import type { SetRequired } from "type-fest";
-import type { RequestChannel } from "./request-channel-injection-token";
 
-export interface RequestChannelListener<TChannel extends RequestChannel<any, any>> {
-  channel: TChannel;
-
-  handler: (
-    request: SetRequired<TChannel, "_requestSignature">["_requestSignature"]
-  ) =>
-    | SetRequired<TChannel, "_responseSignature">["_responseSignature"]
-    | Promise<
-        SetRequired<TChannel, "_responseSignature">["_responseSignature"]
-      >;
+export interface RequestChannel<Request, Response> {
+  id: string;
+  _requestSignature?: Request; // used only to mark `Request` as "used"
+  _responseSignature?: Response; // used only to mark `Response` as "used"
 }
-
-export const requestChannelListenerInjectionToken = getInjectionToken<RequestChannelListener<RequestChannel<any, any>>>(
-  {
-    id: "request-channel-listener",
-  },
-);
diff --git a/src/common/utils/channel/request-from-channel-injection-token.ts b/src/common/utils/channel/request-from-channel-injection-token.ts
index 5f4492543f..14e925f190 100644
--- a/src/common/utils/channel/request-from-channel-injection-token.ts
+++ b/src/common/utils/channel/request-from-channel-injection-token.ts
@@ -3,19 +3,13 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { SetRequired } from "type-fest";
-import type { RequestChannel } from "./request-channel-injection-token";
+import type { RequestChannel } from "./request-channel-listener-injection-token";
 
-export type RequestFromChannel = <
-  TChannel extends RequestChannel<any, any>,
->(
-  channel: TChannel,
-  ...request: TChannel["_requestSignature"] extends void
-    ? []
-    : [TChannel["_requestSignature"]]
-) => Promise<SetRequired<TChannel, "_responseSignature">["_responseSignature"]>;
+export interface RequestFromChannel {
+  <Request, Response>(channel: RequestChannel<Request, Response>, request: Request): Promise<Response>;
+  <Response>(channel: RequestChannel<void, Response>): Promise<Response>;
+}
 
-export const requestFromChannelInjectionToken =
-  getInjectionToken<RequestFromChannel>({
-    id: "request-from-request-channel",
-  });
+export const requestFromChannelInjectionToken = getInjectionToken<RequestFromChannel>({
+  id: "request-from-request-channel",
+});
diff --git a/src/common/utils/composable-responsibilities/discriminable/discriminable.ts b/src/common/utils/composable-responsibilities/discriminable/discriminable.ts
new file mode 100644
index 0000000000..7976004ee6
--- /dev/null
+++ b/src/common/utils/composable-responsibilities/discriminable/discriminable.ts
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+// See: https://www.typescriptlang.org/docs/handbook/2/narrowing.html#discriminated-unions
+export interface Discriminable<T extends string> { readonly kind: T }
+
+// Note: this will fail at transpilation time, if all kinds are not instructed in switch/case.
+// See: https://www.typescriptlang.org/docs/handbook/2/narrowing.html#exhaustiveness-checking
+export const checkThatAllDiscriminablesAreExhausted = <T extends never>(value: T) => {
+  const _exhaustiveCheck: never = value;
+
+  return new Error(
+    `Tried to exhaust discriminables, but no instructions were found for ${(_exhaustiveCheck as any).kind}`,
+  );
+};
diff --git a/src/renderer/api/index.ts b/src/common/utils/composable-responsibilities/labelable/labelable.ts
similarity index 71%
rename from src/renderer/api/index.ts
rename to src/common/utils/composable-responsibilities/labelable/labelable.ts
index 379d1e292b..e0f2d98c21 100644
--- a/src/renderer/api/index.ts
+++ b/src/common/utils/composable-responsibilities/labelable/labelable.ts
@@ -2,5 +2,6 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-
-export { apiBase, apiKube } from "../../common/k8s-api";
+export interface Labelable {
+  readonly label: string;
+}
diff --git a/src/common/utils/composable-responsibilities/orderable/orderable.ts b/src/common/utils/composable-responsibilities/orderable/orderable.ts
new file mode 100644
index 0000000000..e0425cc0a7
--- /dev/null
+++ b/src/common/utils/composable-responsibilities/orderable/orderable.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { sortBy } from "lodash/fp";
+
+export interface Orderable {
+  readonly orderNumber: number;
+}
+
+export type MaybeOrderable = Orderable | object;
+
+export const orderByOrderNumber = <T extends MaybeOrderable>(maybeOrderables: T[]) =>
+  sortBy(
+    (orderable) =>
+      "orderNumber" in orderable
+        ? orderable.orderNumber
+        : Number.MAX_SAFE_INTEGER,
+    maybeOrderables,
+  );
diff --git a/src/common/utils/composable-responsibilities/showable/showable.ts b/src/common/utils/composable-responsibilities/showable/showable.ts
new file mode 100644
index 0000000000..ad8e2ed25b
--- /dev/null
+++ b/src/common/utils/composable-responsibilities/showable/showable.ts
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { IComputedValue } from "mobx";
+import { isBoolean } from "../../type-narrowing";
+
+export interface Showable {
+  readonly isShown: IComputedValue<boolean> | boolean;
+}
+
+export type MaybeShowable = Showable | object;
+
+export const isShown = (showable: MaybeShowable) => {
+  if (!("isShown" in showable)) {
+    return true;
+  }
+
+  if (showable.isShown === undefined) {
+    return true;
+  }
+
+  if (isBoolean(showable.isShown)) {
+    return showable.isShown;
+  }
+
+  return showable.isShown.get();
+};
diff --git a/src/common/utils/composite/composite-has-descendant/composite-has-descendant.test.ts b/src/common/utils/composite/composite-has-descendant/composite-has-descendant.test.ts
new file mode 100644
index 0000000000..0b7f07bf2d
--- /dev/null
+++ b/src/common/utils/composite/composite-has-descendant/composite-has-descendant.test.ts
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { Composite } from "../get-composite/get-composite";
+import { compositeHasDescendant } from "./composite-has-descendant";
+import { getCompositeFor } from "../get-composite/get-composite";
+
+describe("composite-has-descendant, given composite with children and grand children", () => {
+  let composite: Composite<{ id: string; parentId?: string }>;
+
+  beforeEach(() => {
+    const items = [
+      { id: "some-root-id", parentId: undefined },
+      { id: "some-child-item", parentId: "some-root-id" },
+
+      {
+        id: "some-grand-child-item",
+        parentId: "some-child-item",
+      },
+    ];
+
+    const getComposite = getCompositeFor<{
+      id: string;
+      parentId?: string;
+    }>({
+      rootId: "some-root-id",
+      getId: (x) => x.id,
+      getParentId: (x) => x.parentId,
+    });
+
+    composite = getComposite(items);
+  });
+
+  it("has a child as descendant", () => {
+    const actual = compositeHasDescendant<typeof composite["value"]>(
+      (referenceComposite) => referenceComposite.value.id === "some-child-item",
+    )(composite);
+
+    expect(actual).toBe(true);
+  });
+
+  it("has a grand child as descendant", () => {
+    const actual = compositeHasDescendant<typeof composite["value"]>(
+      (referenceComposite) =>
+        referenceComposite.value.id === "some-grand-child-item",
+    )(composite);
+
+    expect(actual).toBe(true);
+  });
+
+  it("does not have an unrelated descendant", () => {
+    const actual = compositeHasDescendant<typeof composite["value"]>(
+      (referenceComposite) =>
+        referenceComposite.value.id === "some-unknown-item",
+    )(composite);
+
+    expect(actual).toBe(false);
+  });
+});
diff --git a/src/common/utils/composite/composite-has-descendant/composite-has-descendant.ts b/src/common/utils/composite/composite-has-descendant/composite-has-descendant.ts
new file mode 100644
index 0000000000..030f79ad74
--- /dev/null
+++ b/src/common/utils/composite/composite-has-descendant/composite-has-descendant.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { Composite } from "../get-composite/get-composite";
+
+const compositeHasDescendant = <T>(
+  predicate: (referenceComposite: Composite<T>) => boolean,
+) => {
+  const _compositeHasDescendant = (composite: Composite<T>): boolean =>
+    predicate(composite) ||
+    !!composite.children.find((childComposite) =>
+      _compositeHasDescendant(childComposite),
+    );
+
+  return _compositeHasDescendant;
+};
+
+export { compositeHasDescendant };
diff --git a/src/common/utils/composite/find-composite/find-composite.test.ts b/src/common/utils/composite/find-composite/find-composite.test.ts
new file mode 100644
index 0000000000..5b4147070e
--- /dev/null
+++ b/src/common/utils/composite/find-composite/find-composite.test.ts
@@ -0,0 +1,91 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { Composite } from "../get-composite/get-composite";
+import { findComposite } from "./find-composite";
+import { getCompositeFor } from "../get-composite/get-composite";
+
+describe("find-composite", () => {
+  let composite: Composite<{ id: string; parentId?: string }>;
+
+  beforeEach(() => {
+    const getComposite = getCompositeFor<{
+      id: string;
+      parentId?: string;
+    }>({
+      rootId: "some-root-id",
+      getId: (x) => x.id,
+      getParentId: (x) => x.parentId,
+    });
+
+    composite = getComposite([
+      { id: "some-root-id" },
+      { id: "some-child-id", parentId: "some-root-id" },
+      { id: "some-grandchild-id", parentId: "some-child-id" },
+      { id: "some-other-grandchild-id", parentId: "some-child-id" },
+    ]);
+  });
+
+  it("when finding root using path, does so", () => {
+    const actual = findComposite("some-root-id")(composite);
+
+    expect(actual.id).toBe("some-root-id");
+  });
+
+  it("when finding child using path, does so", () => {
+    const actual = findComposite("some-root-id", "some-child-id")(composite);
+
+    expect(actual.id).toBe("some-child-id");
+  });
+
+  it("when finding grandchild using path, does so", () => {
+    const actual = findComposite(
+      "some-root-id",
+      "some-child-id",
+      "some-grandchild-id",
+    )(composite);
+
+    expect(actual.id).toBe("some-grandchild-id");
+  });
+
+  it("when finding with non existing leaf-level path, throws", () => {
+    expect(() => {
+      findComposite(
+        "some-root-id",
+        "some-child-id",
+        "some-non-existing-grandchild-id",
+      )(composite);
+    }).toThrow(`Tried to find 'some-root-id -> some-child-id -> some-non-existing-grandchild-id' from a composite, but found nothing.
+
+Node 'some-root-id -> some-child-id' had only following children:
+some-grandchild-id
+some-other-grandchild-id`);
+  });
+
+  it("when finding with non-existing mid-level path, throws", () => {
+    expect(() => {
+      findComposite(
+        "some-root-id",
+        "some-non-existing-child-id",
+        "some-non-existing-grandchild-id",
+      )(composite);
+    }).toThrow(`Tried to find 'some-root-id -> some-non-existing-child-id -> some-non-existing-grandchild-id' from a composite, but found nothing.
+
+Node 'some-root-id' had only following children:
+some-child-id`);
+  });
+
+  it("when finding with non-existing root-level path, throws", () => {
+    expect(() => {
+      findComposite(
+        "some-non-existing-root-id",
+        "some-non-existing-child-id",
+        "some-non-existing-grandchild-id",
+      )(composite);
+    }).toThrow(`Tried to find 'some-non-existing-root-id -> some-non-existing-child-id -> some-non-existing-grandchild-id' from a composite, but found nothing.
+
+Node 'some-root-id' had only following children:
+some-child-id`);
+  });
+});
diff --git a/src/common/utils/composite/find-composite/find-composite.ts b/src/common/utils/composite/find-composite/find-composite.ts
new file mode 100644
index 0000000000..71dcf5baa3
--- /dev/null
+++ b/src/common/utils/composite/find-composite/find-composite.ts
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { Composite } from "../get-composite/get-composite";
+
+const _findComposite = <T>(currentLeftIds: string[], currentId: string, currentRightIds: string[], composite: Composite<T>): Composite<T> => {
+  const [nextId, ...nextRightIds] = currentRightIds;
+  const nextLeftIds = [...currentLeftIds, currentId];
+
+  if (currentRightIds.length === 0 && composite.id === currentId) {
+    return composite;
+  }
+
+  const foundChildComposite = composite.children.find((child) => child.id === nextId);
+
+  if (foundChildComposite) {
+    return _findComposite(nextLeftIds, nextId, nextRightIds, foundChildComposite);
+  }
+
+  const fullPathString = [...currentLeftIds, currentId, ...currentRightIds].join(" -> ");
+
+  throw new Error(`Tried to find '${fullPathString}' from a composite, but found nothing.
+
+Node '${[...currentLeftIds, composite.id].join(" -> ")}' had only following children:
+${composite.children.map((child) => child.id).join("\n")}`);
+};
+
+export const findComposite =
+  (...path: string[]) =>
+  <T>(composite: Composite<T>): Composite<T> => {
+    const [currentId, ...rightIds] = path;
+    const leftIds: string[] = [];
+
+    return _findComposite(leftIds, currentId, rightIds, composite);
+  };
diff --git a/src/common/utils/composite/get-composite-normalization/get-composite-normalization.test.ts b/src/common/utils/composite/get-composite-normalization/get-composite-normalization.test.ts
new file mode 100644
index 0000000000..ac88973251
--- /dev/null
+++ b/src/common/utils/composite/get-composite-normalization/get-composite-normalization.test.ts
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getCompositeNormalization } from "./get-composite-normalization";
+import { getCompositeFor } from "../get-composite/get-composite";
+
+
+describe("get-composite-normalization", () => {
+  it("given a composite, flattens it to paths and composites", () => {
+    const someRootItem = {
+      id: "some-root-id",
+      parentId: undefined,
+    };
+
+    const someItem = {
+      id: "some-id",
+      parentId: "some-root-id",
+    };
+
+    const someNestedItem = {
+      id: "some-child-id",
+      parentId: "some-id",
+    };
+
+    const items = [someRootItem, someItem, someNestedItem];
+
+    const getComposite = getCompositeFor<{
+      id: string;
+      parentId?: string;
+      orderNumber?: number;
+    }>({
+      rootId: "some-root-id",
+      getId: (x) => x.id,
+      getParentId: (x) => x.parentId,
+    });
+
+    const composite = getComposite(items);
+
+    const actual = getCompositeNormalization(composite);
+
+    expect(actual).toEqual([
+      [["some-root-id"], expect.objectContaining({ value: someRootItem })],
+
+      [["some-root-id", "some-id"], expect.objectContaining({ value: someItem })],
+
+      [
+        ["some-root-id", "some-id", "some-child-id"],
+        expect.objectContaining({ value: someNestedItem }),
+      ],
+    ]);
+  });
+});
diff --git a/src/common/utils/composite/get-composite-normalization/get-composite-normalization.ts b/src/common/utils/composite/get-composite-normalization/get-composite-normalization.ts
new file mode 100644
index 0000000000..eb5628171a
--- /dev/null
+++ b/src/common/utils/composite/get-composite-normalization/get-composite-normalization.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { Composite } from "../get-composite/get-composite";
+
+export const getCompositeNormalization = <T>(composite: Composite<T>) => {
+  const _normalizeComposite = <T>(
+    composite: Composite<T>,
+    previousPath: string[] = [],
+  ): (readonly [path: string[], composite: Composite<T>])[] => {
+    const currentPath = [...previousPath, composite.id];
+
+    const pathAndCompositeTuple = [currentPath, composite] as const;
+
+    return [
+      pathAndCompositeTuple,
+
+      ...composite.children.flatMap((child) =>
+        _normalizeComposite(child, currentPath),
+      ),
+    ];
+  };
+
+  return _normalizeComposite(composite);
+};
diff --git a/src/common/utils/composite/get-composite-paths/get-composite-paths.test.ts b/src/common/utils/composite/get-composite-paths/get-composite-paths.test.ts
new file mode 100644
index 0000000000..079f7e1b83
--- /dev/null
+++ b/src/common/utils/composite/get-composite-paths/get-composite-paths.test.ts
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getCompositePaths } from "./get-composite-paths";
+import { sortBy } from "lodash/fp";
+import { getCompositeFor } from "../get-composite/get-composite";
+
+describe("get-composite-paths", () => {
+  it("given composite with transformed children, returns paths of transformed children in hierarchical order", () => {
+    const someRootItem = {
+      id: "some-root-id",
+    };
+
+    const someChildItem1 = {
+      id: "some-child-id-1",
+      parentId: "some-root-id",
+      orderNumber: 1,
+    };
+
+    const someChildItem2 = {
+      id: "some-child-id-2",
+      parentId: "some-root-id",
+      orderNumber: 2,
+    };
+
+    const someGrandchildItem1 = {
+      id: "some-grandchild-id-1",
+      parentId: "some-child-id-1",
+      orderNumber: 1,
+    };
+
+    const someGrandchildItem2 = {
+      id: "some-grandchild-id-2",
+      parentId: "some-child-id-1",
+      orderNumber: 2,
+    };
+
+    const items = [
+      someRootItem,
+      // Note: not in order yet.
+      someChildItem2,
+      someChildItem1,
+      someGrandchildItem2,
+      someGrandchildItem1,
+    ];
+
+    const getComposite = getCompositeFor<{
+      id: string;
+      parentId?: string;
+      orderNumber?: number;
+    }>({
+      rootId: "some-root-id",
+      getId: (x) => x.id,
+      getParentId: (x) => x.parentId,
+      transformChildren: children => sortBy(child => child.orderNumber, children),
+    });
+
+    const composite = getComposite(items);
+
+    const actual = getCompositePaths(composite);
+
+    expect(actual).toEqual([
+      ["some-root-id"],
+      ["some-root-id", "some-child-id-1"],
+      ["some-root-id", "some-child-id-1", "some-grandchild-id-1"],
+      ["some-root-id", "some-child-id-1", "some-grandchild-id-2"],
+      ["some-root-id", "some-child-id-2"],
+    ]);
+  });
+});
diff --git a/src/common/utils/composite/get-composite-paths/get-composite-paths.ts b/src/common/utils/composite/get-composite-paths/get-composite-paths.ts
new file mode 100644
index 0000000000..2b97467431
--- /dev/null
+++ b/src/common/utils/composite/get-composite-paths/get-composite-paths.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { pipeline } from "@ogre-tools/fp";
+import { map } from "lodash/fp";
+import type { Composite } from "../get-composite/get-composite";
+import { getCompositeNormalization } from "../get-composite-normalization/get-composite-normalization";
+
+export const getCompositePaths = (
+  composite: Composite<unknown>,
+): string[][] => pipeline(composite, getCompositeNormalization, map(([path]) => path));
diff --git a/src/common/utils/composite/get-composite/get-composite.test.ts b/src/common/utils/composite/get-composite/get-composite.test.ts
new file mode 100644
index 0000000000..594d0f3d01
--- /dev/null
+++ b/src/common/utils/composite/get-composite/get-composite.test.ts
@@ -0,0 +1,363 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { Composite } from "./get-composite";
+import { getCompositePaths } from "../get-composite-paths/get-composite-paths";
+import { sortBy } from "lodash/fp";
+import { getCompositeFor } from "./get-composite";
+
+interface SomeItem {
+  id: string;
+  parentId?: string;
+  orderNumber?: number;
+}
+
+describe("get-composite", () => {
+  it("given items and an explicit root id, creates a composite", () => {
+    const someRootItem = {
+      id: "some-root-id",
+      someProperty: "some-root-content",
+    };
+
+    const someIrrelevantRootItem = {
+      id: "some-irrelevant-root-id",
+      someProperty: "some-other-root-content",
+    };
+
+    const someItem = {
+      id: "some-id",
+      parentId: "some-root-id",
+      someProperty: "some-content",
+    };
+
+    const someNestedItem = {
+      id: "some-nested-id",
+      parentId: "some-id",
+      someProperty: "some-nested-content",
+    };
+
+    const items = [someRootItem, someIrrelevantRootItem, someItem, someNestedItem];
+
+    const getComposite = getCompositeFor<SomeItem>({
+      rootId: "some-root-id",
+      getId: (x) => x.id,
+      getParentId: (x) => x.parentId,
+    });
+
+    const composite = getComposite(items);
+
+    expect(composite).toEqual({
+      id: "some-root-id",
+      value: someRootItem,
+
+      children: [
+        {
+          id: "some-id",
+          parentId: "some-root-id",
+          value: someItem,
+
+          children: [
+            {
+              id: "some-nested-id",
+              parentId: "some-id",
+              value: someNestedItem,
+              children: [],
+            },
+          ],
+        },
+      ],
+    });
+  });
+
+  it("given items and implicit root, creates a composite", () => {
+    const someRootItem = {
+      id: "some-root-id",
+      someProperty: "some-root-content",
+      // Notice: no "parentId" makes this the implicit root.
+      parentId: undefined,
+    };
+
+    const someItem = {
+      id: "some-id",
+      parentId: "some-root-id",
+      someProperty: "some-content",
+    };
+
+    const someNestedItem = {
+      id: "some-nested-id",
+      parentId: "some-id",
+      someProperty: "some-nested-content",
+    };
+
+    const items = [someRootItem, someItem, someNestedItem];
+
+    const getComposite = getCompositeFor<SomeItem>({
+      // Notice: no root id
+      // rootId: "some-root-id",
+      getId: (x) => x.id,
+      getParentId: (x) => x.parentId,
+    });
+
+    const composite = getComposite(items);
+
+    expect(composite).toEqual({
+      id: "some-root-id",
+      value: someRootItem,
+
+      children: [
+        {
+          id: "some-id",
+          parentId: "some-root-id",
+          value: someItem,
+
+          children: [
+            {
+              id: "some-nested-id",
+              parentId: "some-id",
+              value: someNestedItem,
+              children: [],
+            },
+          ],
+        },
+      ],
+    });
+  });
+
+  it("given items and an unspecified root id and multiple items without parent as root, throws", () => {
+    const someRootItem = {
+      id: "some-root-id",
+      // Notice: no "parentId" makes this a root.
+      parentId: undefined,
+    };
+
+    const someOtherRootItem = {
+      id: "some-other-root-id",
+      // Notice: no "parentId" makes also this a root.
+      parentId: undefined,
+    };
+
+    const items = [someRootItem, someOtherRootItem];
+
+    const getComposite = getCompositeFor<SomeItem>({
+      getId: (x) => x.id,
+      getParentId: (x) => x.parentId,
+    });
+
+    expect(() => {
+      getComposite(items);
+    }).toThrow(
+      'Tried to get a composite, but multiple roots where encountered: "some-root-id", "some-other-root-id"',
+    );
+  });
+
+  it("given non-unique ids, throws", () => {
+    const someItem = {
+      id: "some-id",
+      parentId: "irrelevant",
+    };
+
+    const someOtherItem = {
+      id: "some-id",
+      parentId: "irrelevant",
+    };
+
+    const items = [someItem, someOtherItem];
+
+    const getComposite = getCompositeFor<SomeItem>({
+      getId: (x) => x.id,
+      getParentId: (x) => x.parentId,
+    });
+
+    expect(() => {
+      getComposite(items);
+    }).toThrow(
+      'Tried to get a composite but encountered non-unique ids: "some-id"',
+    );
+  });
+
+  it("given items with missing parent ids, when creating composite without handling for unknown parents, throws", () => {
+    const someItem = {
+      id: "some-id",
+      parentId: undefined,
+    };
+
+    const someItemWithMissingParentId = {
+      id: "some-other-id",
+      parentId: "some-missing-id",
+    };
+
+    const items = [someItem, someItemWithMissingParentId];
+
+    const getComposite = getCompositeFor<SomeItem>({
+      getId: (x) => x.id,
+      getParentId: (x) => x.parentId,
+    });
+
+    expect(() => {
+      getComposite(items);
+    }).toThrow(
+      `Tried to get a composite but encountered missing parent ids: "some-missing-id".
+
+Available parent ids are:
+"some-id",
+"some-other-id"`,
+    );
+  });
+
+  describe("given items with missing parents, when creating composite with handling for missing parents", () => {
+    let composite: Composite<any>;
+    let handleMissingParentIdMock: jest.Mock;
+
+    beforeEach(() => {
+      const someItem = {
+        id: "some-root-id",
+      };
+
+      const someItemWithMissingParentId = {
+        id: "some-orphan-id",
+        // Note: the item corresponding to this id does not exist,
+        // making this item have a "missing parent".
+        parentId: "some-missing-id",
+      };
+
+      const items = [someItem, someItemWithMissingParentId];
+
+      handleMissingParentIdMock = jest.fn();
+
+      const getComposite = getCompositeFor<SomeItem>({
+        getId: (x) => x.id,
+        getParentId: (x) => x.parentId,
+        handleMissingParentIds: handleMissingParentIdMock,
+      });
+
+      composite = getComposite(items);
+    });
+
+    it("creates composite without the orphan item, and without throwing", () => {
+      const paths = getCompositePaths(composite);
+
+      expect(paths).toEqual([["some-root-id"]]);
+    });
+
+    it("handles the missing parent ids", () => {
+      expect(handleMissingParentIdMock).toHaveBeenCalledWith({
+        missingParentIds: ["some-missing-id"],
+        availableParentIds: ["some-root-id", "some-orphan-id"],
+      });
+    });
+  });
+
+  it("given items with same id and parent id, throws", () => {
+    const someItem = {
+      id: "some-id",
+      parentId: "some-id",
+    };
+
+    const someRoot = {
+      id: "root",
+      parentId: undefined,
+    };
+
+    const items = [someItem, someRoot];
+
+    const getComposite = getCompositeFor<SomeItem>({
+      getId: (x) => x.id,
+      getParentId: (x) => x.parentId,
+    });
+
+    expect(() => {
+      getComposite(items);
+    }).toThrow(
+      'Tried to get a composite, but found items with self as parent: "some-id"',
+    );
+  });
+
+  it("given undefined ids, throws", () => {
+    const root = {
+      parentId: undefined,
+      id: "some-root",
+    };
+
+    const someItem = {
+      parentId: "some-root",
+      id: undefined,
+    };
+
+    const someOtherItem = {
+      parentId: "some-root",
+      id: undefined,
+    };
+
+    const items = [root, someItem, someOtherItem];
+
+    const getComposite = getCompositeFor<any>({
+      getId: (x) => x.id,
+      getParentId: (x) => x.parentId,
+    });
+
+    expect(() => {
+      getComposite(items);
+    }).toThrow("Tried to get a composite but encountered 2 undefined ids");
+  });
+
+  it("given transformed children, creates a composite with transformed children", () => {
+    const someRootItem = {
+      id: "some-root-id",
+      orderNumber: 1,
+    };
+
+    const someItem1 = {
+      id: "some-id-1",
+      parentId: "some-root-id",
+      orderNumber: 1,
+    };
+
+    const someItem2 = {
+      id: "some-id-2",
+      parentId: "some-root-id",
+      orderNumber: 2,
+    };
+
+    const someChildItem1 = {
+      id: "some-child-id-1",
+      parentId: "some-id-1",
+      orderNumber: 1,
+    };
+
+    const someChildItem2 = {
+      id: "some-child-id-2",
+      parentId: "some-id-1",
+      orderNumber: 2,
+    };
+
+    const items = [
+      someRootItem,
+      // Note: not in order yet.
+      someItem2,
+      someItem1,
+      someChildItem2,
+      someChildItem1,
+    ];
+
+    const getComposite = getCompositeFor<SomeItem>({
+      getId: (x) => x.id,
+      getParentId: (x) => x.parentId,
+      transformChildren: (things) =>
+        sortBy((thing) => thing.orderNumber, things),
+    });
+
+    const composite = getComposite(items);
+
+    const orderedPaths = getCompositePaths(composite);
+
+    expect(orderedPaths).toEqual([
+      ["some-root-id"],
+      ["some-root-id", "some-id-1"],
+      ["some-root-id", "some-id-1", "some-child-id-1"],
+      ["some-root-id", "some-id-1", "some-child-id-2"],
+      ["some-root-id", "some-id-2"],
+    ]);
+  });
+});
diff --git a/src/common/utils/composite/get-composite/get-composite.ts b/src/common/utils/composite/get-composite/get-composite.ts
new file mode 100644
index 0000000000..7e499ad40a
--- /dev/null
+++ b/src/common/utils/composite/get-composite/get-composite.ts
@@ -0,0 +1,147 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { pipeline } from "@ogre-tools/fp";
+import {
+  countBy,
+  filter,
+  toPairs,
+  nth,
+  map,
+  uniq,
+  without,
+  compact,
+  identity,
+} from "lodash/fp";
+
+export interface Composite<T> {
+  id: string;
+  parentId: string | undefined;
+  value: T;
+  children: Composite<T>[];
+}
+
+interface Configuration<T> {
+  rootId?: string;
+  getId: (thing: T) => string;
+  getParentId: (thing: T) => string | undefined;
+  transformChildren?: (things: T[]) => T[];
+  handleMissingParentIds?: (parentIdsForHandling: ParentIdsForHandling) => void;
+}
+
+export const getCompositeFor = <T>({
+  rootId = undefined,
+  getId,
+  getParentId,
+  transformChildren = identity,
+  handleMissingParentIds = throwMissingParentIds,
+}: Configuration<T>) => (source: T[]) => {
+    const undefinedIds = pipeline(
+      source,
+      filter((x) => getId(x) === undefined),
+    );
+
+    if (undefinedIds.length) {
+      throw new Error(
+        `Tried to get a composite but encountered ${undefinedIds.length} undefined ids`,
+      );
+    }
+
+    const selfReferencingIds = pipeline(
+      source,
+      filter((x) => getId(x) === getParentId(x)),
+      map(getId),
+    );
+
+    if (selfReferencingIds.length) {
+      throw new Error(
+        `Tried to get a composite, but found items with self as parent: "${selfReferencingIds.join(
+          '", ',
+        )}"`,
+      );
+    }
+
+    const duplicateIds = pipeline(
+      source,
+      countBy(getId),
+      toPairs,
+      filter(([, count]) => count > 1),
+      map(nth(0)),
+    );
+
+    if (duplicateIds.length) {
+      throw new Error(
+        `Tried to get a composite but encountered non-unique ids: "${duplicateIds
+          .map((x) => String(x))
+          .join('", "')}"`,
+      );
+    }
+
+    const allIds = pipeline(source, map(getId));
+
+    const allParentIds = pipeline(source, map(getParentId), uniq, compact);
+
+    const missingParentIds = without(allIds, allParentIds);
+
+    if (missingParentIds.length) {
+      handleMissingParentIds({ missingParentIds, availableParentIds: allIds });
+    }
+
+    const toComposite = (thing: T): Composite<T> => {
+      const thingId = getId(thing);
+
+      return {
+        id: thingId,
+        parentId: getParentId(thing),
+        value: thing,
+
+        children: pipeline(
+          source,
+
+          filter((childThing) => {
+            const parentId = getParentId(childThing);
+
+            return parentId === thingId;
+          }),
+
+          transformChildren,
+
+          map(toComposite),
+        ),
+      };
+    };
+
+    const isRootId = rootId
+      ? (thing: T) => getId(thing) === rootId
+      : (thing: T) => getParentId(thing) === undefined;
+
+    const roots = source.filter(isRootId);
+
+    if (roots.length > 1) {
+      throw new Error(
+        `Tried to get a composite, but multiple roots where encountered: "${roots
+          .map(getId)
+          .join('", "')}"`,
+      );
+    }
+
+    return toComposite(roots[0]);
+  };
+
+interface ParentIdsForHandling {
+  missingParentIds: string[];
+  availableParentIds: string[];
+}
+
+const throwMissingParentIds = ({
+  missingParentIds,
+  availableParentIds,
+}: ParentIdsForHandling) => {
+  throw new Error(
+    `Tried to get a composite but encountered missing parent ids: "${missingParentIds.join(
+      '", "',
+    )}".\n\nAvailable parent ids are:\n"${availableParentIds.join('",\n"')}"`,
+  );
+};
diff --git a/src/common/utils/composite/interfaces.ts b/src/common/utils/composite/interfaces.ts
new file mode 100644
index 0000000000..1c29a0e4ce
--- /dev/null
+++ b/src/common/utils/composite/interfaces.ts
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+export interface ParentOfChildComposite<Id extends string = string> {
+  id: Id;
+}
+
+export interface ChildOfParentComposite<ParentId extends string = string> {
+  parentId: ParentId;
+}
+
+export type RootComposite<Id extends string = string> =
+  & { parentId: undefined }
+  & ParentOfChildComposite<Id>;
diff --git a/src/common/utils/date/get-current-date-time.ts b/src/common/utils/date/get-current-date-time.ts
index bf3df2bd78..aa4d5e7fa3 100644
--- a/src/common/utils/date/get-current-date-time.ts
+++ b/src/common/utils/date/get-current-date-time.ts
@@ -5,3 +5,7 @@
 import moment from "moment";
 
 export const getCurrentDateTime = () => moment().utc().format();
+
+export const getMillisecondsFromUnixEpoch = () => Date.now();
+
+export const getSecondsFromUnixEpoch = () => Math.floor(getMillisecondsFromUnixEpoch() / 1000);
diff --git a/src/common/utils/disposer.ts b/src/common/utils/disposer.ts
index 05a349ab4d..2949a7ae35 100644
--- a/src/common/utils/disposer.ts
+++ b/src/common/utils/disposer.ts
@@ -3,6 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
+import type { SingleOrMany } from "./types";
+
 
 
 export interface Disposer {
@@ -17,9 +19,9 @@ export interface ExtendableDisposer extends Disposer {
   push(...vals: (Disposer | ExtendableDisposer | Disposable)[]): void;
 }
 
-export function disposer(...items: (Disposer | Disposable | undefined | null)[]): ExtendableDisposer {
+export function disposer(...items: SingleOrMany<Disposer | Disposable | undefined | null>[]): ExtendableDisposer {
   return Object.assign(() => {
-    for (const item of items) {
+    for (const item of items.flat()) {
       if (!item) {
         continue;
       }
diff --git a/src/common/utils/downloadFile.ts b/src/common/utils/downloadFile.ts
deleted file mode 100644
index 5f3e658aa6..0000000000
--- a/src/common/utils/downloadFile.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import request from "request";
-import type { JsonValue } from "type-fest";
-import { parse } from "./json";
-
-export interface DownloadFileOptions {
-  url: string;
-  gzip?: boolean;
-  timeout?: number;
-}
-
-export interface DownloadFileTicket<T> {
-  url: string;
-  promise: Promise<T>;
-  cancel(): void;
-}
-
-export function downloadFile({ url, timeout, gzip = true }: DownloadFileOptions): DownloadFileTicket<Buffer> {
-  const fileChunks: Buffer[] = [];
-  const req = request(url, { gzip, timeout });
-  const promise: Promise<Buffer> = new Promise((resolve, reject) => {
-    req.on("data", (chunk: Buffer) => {
-      fileChunks.push(chunk);
-    });
-    req.once("error", err => {
-      reject({ url, err });
-    });
-    req.once("complete", () => {
-      resolve(Buffer.concat(fileChunks));
-    });
-  });
-
-  return {
-    url,
-    promise,
-    cancel() {
-      req.abort();
-    },
-  };
-}
-
-export function downloadJson(args: DownloadFileOptions): DownloadFileTicket<JsonValue> {
-  const { promise, ...rest } = downloadFile(args);
-
-  return {
-    promise: promise.then(res => parse(res.toString())),
-    ...rest,
-  };
-}
diff --git a/src/common/utils/find-exactly-one/find-exactly-one.test.ts b/src/common/utils/find-exactly-one/find-exactly-one.test.ts
new file mode 100644
index 0000000000..08dbb9ce72
--- /dev/null
+++ b/src/common/utils/find-exactly-one/find-exactly-one.test.ts
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { findExactlyOne } from "./find-exactly-one";
+
+describe("find-exactly-one", () => {
+  it("when predicate matches to single item, returns the item", () => {
+    const actual = findExactlyOne((item) => item === "some-item")([
+      "some-item",
+      "some-other-item",
+    ]);
+
+    expect(actual).toBe("some-item");
+  });
+
+  it("when predicate matches to many items, throws", () => {
+    expect(() => {
+      findExactlyOne((item) => item === "some-item")([
+        "some-item",
+        "some-item",
+      ]);
+    }).toThrow("Tried to find exactly one, but found many");
+  });
+
+  it("when predicate does not match, throws", () => {
+    expect(() => {
+      findExactlyOne((item) => item === "some-item")([
+        "some-other-item",
+      ]);
+    }).toThrow("Tried to find exactly one, but didn't find any");
+  });
+});
diff --git a/src/common/utils/find-exactly-one/find-exactly-one.ts b/src/common/utils/find-exactly-one/find-exactly-one.ts
new file mode 100644
index 0000000000..181720d8b1
--- /dev/null
+++ b/src/common/utils/find-exactly-one/find-exactly-one.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+export const findExactlyOne = <T>(predicate: (item: T) => boolean) => (collection: T[]): T => {
+  const itemsFound = collection.filter(predicate);
+
+  if (!itemsFound.length) {
+    throw new Error(
+      "Tried to find exactly one, but didn't find any",
+    );
+  }
+
+  if (itemsFound.length > 1) {
+    throw new Error(
+      "Tried to find exactly one, but found many",
+    );
+  }
+
+  return itemsFound[0];
+};
diff --git a/src/common/utils/get-startable-stoppable.test.ts b/src/common/utils/get-startable-stoppable.test.ts
index 24b9e1862d..dc8b24dd43 100644
--- a/src/common/utils/get-startable-stoppable.test.ts
+++ b/src/common/utils/get-startable-stoppable.test.ts
@@ -2,21 +2,17 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { AsyncFnMock } from "@async-fn/jest";
-import asyncFn from "@async-fn/jest";
+import type { StartableStoppable } from "./get-startable-stoppable";
 import { getStartableStoppable } from "./get-startable-stoppable";
-import { getPromiseStatus } from "../test-utils/get-promise-status";
-import { flushPromises } from "../test-utils/flush-promises";
 
 describe("getStartableStoppable", () => {
-  let stopMock: AsyncFnMock<() => Promise<void>>;
-  let startMock: AsyncFnMock<() => Promise<() => Promise<void>>>;
-  let actual: { stop: () => Promise<void>; start: () => Promise<void>; started: boolean };
+  let stopMock: jest.MockedFunction<() => void>;
+  let startMock: jest.MockedFunction<() => () => void>;
+  let actual: StartableStoppable;
 
   beforeEach(() => {
-    stopMock = asyncFn();
-    startMock = asyncFn();
-
+    stopMock = jest.fn();
+    startMock = jest.fn().mockImplementation(() => stopMock);
     actual = getStartableStoppable("some-id", startMock);
   });
 
@@ -29,7 +25,7 @@ describe("getStartableStoppable", () => {
   });
 
   it("when stopping before ever starting, throws", () => {
-    expect(actual.stop).rejects.toThrow("Tried to stop \"some-id\", but it has not started yet.");
+    expect(() => actual.stop()).toThrow("Tried to stop \"some-id\", but it is already stopped.");
   });
 
   it("is not started", () => {
@@ -37,199 +33,30 @@ describe("getStartableStoppable", () => {
   });
 
   describe("when started", () => {
-    let startPromise: Promise<void>;
-
     beforeEach(() => {
-      startPromise = actual.start();
+      actual.start();
     });
 
-    it("starts starting", () => {
+    it("calls start function", () => {
       expect(startMock).toHaveBeenCalled();
     });
 
-    it("starting does not resolve yet", async () => {
-      const promiseStatus = await getPromiseStatus(startPromise);
-
-      expect(promiseStatus.fulfilled).toBe(false);
+    it("is started", () => {
+      expect(actual.started).toBe(true);
     });
 
-    it("is not started yet", () => {
-      expect(actual.started).toBe(false);
-    });
-
-    describe("when started again before the start has finished", () => {
-      let error: Error;
-
+    describe("when stopped", () => {
       beforeEach(() => {
-        startMock.mockClear();
-
-        actual.start().catch((e) => { error = e; });
+        actual.stop();
       });
 
-      it("does not start starting again", () => {
-        expect(startMock).not.toHaveBeenCalled();
+      it("calls stop function", () => {
+        expect(stopMock).toBeCalled();
       });
 
-      it("throws", () => {
-        expect(error.message).toBe("Tried to start \"some-id\", but it is already being started.");
-      });
-    });
-
-    describe("when starting finishes", () => {
-      beforeEach(async () => {
-        await startMock.resolve(stopMock);
-      });
-
-      it("is started", () => {
-        expect(actual.started).toBe(true);
-      });
-
-      it("starting resolves", async () => {
-        const promiseStatus = await getPromiseStatus(startPromise);
-
-        expect(promiseStatus.fulfilled).toBe(true);
-      });
-
-      it("when started again, throws", () => {
-        expect(actual.start).rejects.toThrow("Tried to start \"some-id\", but it has already started.");
-      });
-
-      it("does not stop yet", () => {
-        expect(stopMock).not.toHaveBeenCalled();
-      });
-
-      describe("when stopped", () => {
-        let stopPromise: Promise<void>;
-
-        beforeEach(() => {
-          stopPromise = actual.stop();
-        });
-
-        it("starts stopping", () => {
-          expect(stopMock).toHaveBeenCalled();
-        });
-
-        it("stopping does not resolve yet", async () => {
-          const promiseStatus = await getPromiseStatus(stopPromise);
-
-          expect(promiseStatus.fulfilled).toBe(false);
-        });
-
-        it("is not stopped yet", () => {
-          expect(actual.started).toBe(true);
-        });
-
-        describe("when stopping finishes", () => {
-          beforeEach(async () => {
-            await stopMock.resolve();
-          });
-
-          it("is not started", () => {
-            expect(actual.started).toBe(false);
-          });
-
-          it("stopping resolves", async () => {
-            const promiseStatus = await getPromiseStatus(stopPromise);
-
-            expect(promiseStatus.fulfilled).toBe(true);
-          });
-
-          it("when stopped again, throws", () => {
-            expect(actual.stop).rejects.toThrow("Tried to stop \"some-id\", but it has already stopped.");
-          });
-
-          describe("when started again", () => {
-            beforeEach(
-              () => {
-                startMock.mockClear();
-
-                actual.start();
-              });
-
-            it("starts", () => {
-              expect(startMock).toHaveBeenCalled();
-            });
-
-            it("is not started yet", () => {
-              expect(actual.started).toBe(false);
-            });
-
-            describe("when starting finishes", () => {
-              beforeEach(async () => {
-                await startMock.resolve(stopMock);
-              });
-
-              it("is started", () => {
-                expect(actual.started).toBe(true);
-              });
-
-              it("when stopped again, starts stopping again", async () => {
-                stopMock.mockClear();
-
-                actual.stop();
-
-                await flushPromises();
-
-                expect(stopMock).toHaveBeenCalled();
-              });
-            });
-          });
-        });
-      });
-    });
-
-    describe("when stopped before starting finishes", () => {
-      let stopPromise: Promise<void>;
-
-      beforeEach(() => {
-        stopPromise = actual.stop();
-      });
-
-      it("does not resolve yet", async () => {
-        const promiseStatus = await getPromiseStatus(stopPromise);
-
-        expect(promiseStatus.fulfilled).toBe(false);
-      });
-
-      it("is not started yet", () => {
+      it("is stopped", () => {
         expect(actual.started).toBe(false);
       });
-
-      describe("when starting finishes", () => {
-        beforeEach(async () => {
-          await startMock.resolve(stopMock);
-        });
-
-        it("starts stopping", () => {
-          expect(stopMock).toHaveBeenCalled();
-        });
-
-        it("is not stopped yet", () => {
-          expect(actual.started).toBe(true);
-        });
-
-        it("does not resolve yet", async () => {
-          const promiseStatus = await getPromiseStatus(stopPromise);
-
-          expect(promiseStatus.fulfilled).toBe(false);
-        });
-
-        describe("when stopping finishes", () => {
-          beforeEach(async () => {
-            await stopMock.resolve();
-          });
-
-          it("is stopped", () => {
-            expect(actual.started).toBe(false);
-          });
-
-          it("resolves", async () => {
-            const promiseStatus = await getPromiseStatus(stopPromise);
-
-            expect(promiseStatus.fulfilled).toBe(true);
-          });
-        });
-      });
     });
   });
 });
diff --git a/src/common/utils/get-startable-stoppable.ts b/src/common/utils/get-startable-stoppable.ts
index 5590157ab8..05d8b4d9af 100644
--- a/src/common/utils/get-startable-stoppable.ts
+++ b/src/common/utils/get-startable-stoppable.ts
@@ -3,58 +3,43 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-type Stopper = () => Promise<void> | void;
-type Starter = () => Promise<Stopper> | Stopper;
+export type Stopper = () => void;
+export type Starter = () => Stopper;
 
-export const getStartableStoppable = (
-  id: string,
-  startAndGetStopCallback: Starter,
-) => {
+export interface StartableStoppable {
+  readonly started: boolean;
+  start: () => void;
+  stop: () => void;
+}
+
+type StartableStoppableState = "stopped" | "started" | "starting";
+
+export function getStartableStoppable(id: string, startAndGetStopper: Starter): StartableStoppable {
   let stop: Stopper;
-  let stopped = false;
-  let started = false;
-  let starting = false;
-  let startingPromise: Promise<Stopper> | Stopper;
+  let state: StartableStoppableState = "stopped";
 
   return {
     get started() {
-      return started;
+      return state === "started";
     },
 
-    start: async () => {
-      if (starting) {
-        throw new Error(`Tried to start "${id}", but it is already being started.`);
+    start: () => {
+      if (state !== "stopped") {
+        throw new Error(`Tried to start "${id}", but it is already ${state}.`);
       }
 
-      starting = true;
-
-      if (started) {
-        throw new Error(`Tried to start "${id}", but it has already started.`);
-      }
-
-      startingPromise = startAndGetStopCallback();
-      stop = await startingPromise;
-
-      stopped = false;
-      started = true;
-      starting = false;
+      state = "starting";
+      stop = startAndGetStopper();
+      state = "started";
     },
 
-    stop: async () => {
-      await startingPromise;
-
-      if (stopped) {
-        throw new Error(`Tried to stop "${id}", but it has already stopped.`);
+    stop: () => {
+      if (state !== "started") {
+        throw new Error(`Tried to stop "${id}", but it is already ${state}.`);
       }
 
-      if (!started) {
-        throw new Error(`Tried to stop "${id}", but it has not started yet.`);
-      }
-
-      await stop();
-
-      started = false;
-      stopped = true;
+      stop();
+      state = "stopped";
     },
   };
-};
+}
diff --git a/src/common/utils/index.ts b/src/common/utils/index.ts
index e16f803c56..36e77c6e79 100644
--- a/src/common/utils/index.ts
+++ b/src/common/utils/index.ts
@@ -14,7 +14,6 @@ export * from "./convertMemory";
 export * from "./debouncePromise";
 export * from "./delay";
 export * from "./disposer";
-export * from "./downloadFile";
 export * from "./escapeRegExp";
 export * from "./formatDuration";
 export * from "./getRandId";
@@ -22,7 +21,6 @@ export * from "./hash-set";
 export * from "./n-fircate";
 export * from "./noop";
 export * from "./observable-crate/impl";
-export * from "./paths";
 export * from "./promise-exec";
 export * from "./readonly";
 export * from "./reject-promise";
diff --git a/src/common/utils/iter.ts b/src/common/utils/iter.ts
index 05d097ed78..9752e56dc5 100644
--- a/src/common/utils/iter.ts
+++ b/src/common/utils/iter.ts
@@ -11,6 +11,7 @@ interface Iterator<T> {
   find(fn: (val: T) => unknown): T | undefined;
   collect<U>(fn: (values: Iterable<T>) => U): U;
   map<U>(fn: (val: T) => U): Iterator<U>;
+  flatMap<U>(fn: (val: T) => U[]): Iterator<U>;
   join(sep?: string): string;
 }
 
@@ -19,6 +20,7 @@ export function pipeline<T>(src: IterableIterator<T>): Iterator<T> {
     filter: (fn) => pipeline(filter(src, fn)),
     filterMap: (fn) => pipeline(filterMap(src, fn)),
     map: (fn) => pipeline(map(src, fn)),
+    flatMap: (fn) => pipeline(flatMap(src, fn)),
     find: (fn) => find(src, fn),
     join: (sep) => join(src, sep),
     collect: (fn) => fn(src),
diff --git a/src/common/utils/lazy-initialized.ts b/src/common/utils/lazy-initialized.ts
deleted file mode 100644
index 62247873fe..0000000000
--- a/src/common/utils/lazy-initialized.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-/**
- * A OnceCell is an object that wraps some function that produces a value.
- *
- * It then only calls the function on the first call to `get()` and returns the
- * same instance/value on every subsequent call.
- */
-export interface LazyInitialized<T> {
-  get(): T;
-}
-
-/**
- * A function to make a `OnceCell<T>`
- */
-export function lazyInitialized<T>(builder: () => T): LazyInitialized<T> {
-  let value: T | undefined;
-  let called = false;
-
-  return {
-    get() {
-      if (called) {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        return value!;
-      }
-
-      value = builder();
-      called = true;
-
-      return value;
-    },
-  };
-}
diff --git a/src/common/utils/objects.ts b/src/common/utils/objects.ts
index 8fe95be46d..9b6355d3e7 100644
--- a/src/common/utils/objects.ts
+++ b/src/common/utils/objects.ts
@@ -17,6 +17,7 @@ export function keys<K extends keyof any>(obj: Record<K, any>): K[] {
   return Object.keys(obj) as K[];
 }
 
+export function entries<K extends string, V>(obj: Partial<Record<K, V>> | null | undefined): [K, V][];
 export function entries<K extends string | number | symbol, V>(obj: Partial<Record<K, V>> | null | undefined): [K, V][];
 export function entries<K extends string | number | symbol, V>(obj: Record<K, V> | null | undefined): [K, V][];
 
diff --git a/src/common/utils/paths.ts b/src/common/utils/paths.ts
deleted file mode 100644
index ed31e612fb..0000000000
--- a/src/common/utils/paths.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import path from "path";
-import os from "os";
-
-export function resolveTilde(filePath: string) {
-  if (filePath === "~") {
-    return os.homedir();
-  }
-
-  if (filePath.startsWith("~/")) {
-    return `${os.homedir()}${filePath.slice(1)}`;
-  }
-
-  return filePath;
-}
-
-export function resolvePath(filePath: string): string {
-  return path.resolve(resolveTilde(filePath));
-}
-
-/**
- * Checks if `testPath` represents a potential filesystem entry that would be
- * logically "within" the `parentPath` directory.
- *
- * This function will return `true` in the above case, and `false` otherwise.
- * It will return `false` if the two paths are the same (after resolving them).
- *
- * The function makes no FS calls and is platform dependant. Meaning that the
- * results are only guaranteed to be correct for the platform you are running
- * on.
- * @param parentPath The known path of a directory
- * @param testPath The path that is to be tested
- */
-export function isLogicalChildPath(parentPath: string, testPath: string): boolean {
-  parentPath = path.resolve(parentPath);
-  testPath = path.resolve(testPath);
-
-  if (parentPath === testPath) {
-    return false;
-  }
-
-  while (testPath.length >= parentPath.length) {
-    if (testPath === parentPath) {
-      return true;
-    }
-
-    testPath = path.dirname(testPath);
-  }
-
-  return false;
-}
diff --git a/src/common/utils/readableStream.ts b/src/common/utils/readableStream.ts
index 136e18c841..59fb5ae4f4 100644
--- a/src/common/utils/readableStream.ts
+++ b/src/common/utils/readableStream.ts
@@ -4,7 +4,6 @@
  */
 
 import { Readable } from "readable-stream";
-import type { ReadableStreamDefaultReadResult } from "stream/web";
 import type { TypedArray } from "type-fest";
 
 /**
@@ -24,8 +23,8 @@ export class ReadableWebToNodeStream<T extends TypedArray> extends Readable {
    * Default web API stream reader
    * https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamDefaultReader
    */
-  private reader: ReadableStreamReader<T>;
-  private pendingRead?: Promise<ReadableStreamDefaultReadResult<T>>;
+  private reader: ReadableStreamDefaultReader<T>;
+  private pendingRead?: Promise<ReadableStreamReadResult<T>>;
 
   /**
    *
diff --git a/src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable.ts b/src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable.ts
deleted file mode 100644
index 5dd17ddc6a..0000000000
--- a/src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { RequestChannel } from "../channel/request-channel-injection-token";
-import { requestChannelInjectionToken } from "../channel/request-channel-injection-token";
-
-export type ResolveSystemProxyChannel = RequestChannel<string, string>;
-
-const resolveSystemProxyChannelInjectable = getInjectable({
-  id: "resolve-system-proxy-channel",
-
-  instantiate: (): ResolveSystemProxyChannel => ({
-    id: "resolve-system-proxy-channel",
-  }),
-
-  injectionToken: requestChannelInjectionToken,
-});
-
-export default resolveSystemProxyChannelInjectable;
diff --git a/src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.ts b/src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.ts
new file mode 100644
index 0000000000..c823a8a8f9
--- /dev/null
+++ b/src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { RequestChannel } from "../channel/request-channel-listener-injection-token";
+
+export type ResolveSystemProxyChannel = RequestChannel<string, string>;
+
+export const resolveSystemProxyChannel: ResolveSystemProxyChannel = {
+  id: "resolve-system-proxy-channel",
+};
diff --git a/src/common/utils/sort-compare.ts b/src/common/utils/sort-compare.ts
index ee32ab45c4..35d88c01b9 100644
--- a/src/common/utils/sort-compare.ts
+++ b/src/common/utils/sort-compare.ts
@@ -3,11 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { SemVer } from "semver";
 import semver, { coerce } from "semver";
-import * as iter from "./iter";
-import type { RawHelmChart } from "../k8s-api/endpoints/helm-charts.api";
-import logger from "../logger";
 
 export enum Ordering {
   LESS = -1,
@@ -49,52 +45,31 @@ export function sortCompare<T>(left: T, right: T): Ordering {
   return Ordering.GREATER;
 }
 
-interface ChartVersion {
-  version: string;
-  __version?: SemVer | null;
-}
-
-export function sortCompareChartVersions(left: ChartVersion, right: ChartVersion): Ordering {
-  if (left.__version && right.__version) {
-    return semver.compare(right.__version, left.__version);
-  }
-
-  if (!left.__version && right.__version) {
-    return Ordering.GREATER;
-  }
-
-  if (left.__version && !right.__version) {
-    return Ordering.LESS;
-  }
-
-  return sortCompare(left.version, right.version);
-}
-
-
-
-export function sortCharts(charts: RawHelmChart[]) {
-  interface ExtendedHelmChart extends RawHelmChart {
-    __version?: SemVer | null;
-  }
-
-  const chartsWithVersion = Array.from(
-    iter.map(
-      charts,
-      chart => {
-        const __version = coerce(chart.version, { loose: true });
-
-        if (!__version) {
-          logger.warn(`[HELM-SERVICE]: Version from helm chart is not loosely coercable to semver.`, { name: chart.name, version: chart.version, repo: chart.repo });
-        }
-
-        (chart as ExtendedHelmChart).__version = __version;
-
-        return chart as ExtendedHelmChart;
-      },
-    ),
-  );
-
-  return chartsWithVersion
-    .sort(sortCompareChartVersions)
-    .map(chart => (delete chart.__version, chart as RawHelmChart));
+/**
+ * This function sorts of list of items that have what should be a semver version formated string
+ * as the field `version` but if it is not loosely coercable to semver falls back to sorting them
+ * alphanumerically
+ */
+export function sortBySemverVersion<T extends { version: string }>(versioneds: T[]): T[] {
+  return versioneds
+    .map(versioned => ({
+      __version: coerce(versioned.version, { loose: true }),
+      raw: versioned,
+    }))
+    .sort((left, right) => {
+      if (left.__version && right.__version) {
+        return semver.compare(right.__version, left.__version);
+      }
+
+      if (!left.__version && right.__version) {
+        return Ordering.GREATER;
+      }
+
+      if (left.__version && !right.__version) {
+        return Ordering.LESS;
+      }
+
+      return sortCompare(left.raw.version, right.raw.version);
+    })
+    .map(({ raw }) => raw);
 }
diff --git a/src/common/utils/sync-box/channel-listener.injectable.ts b/src/common/utils/sync-box/channel-listener.injectable.ts
new file mode 100644
index 0000000000..a97d95d726
--- /dev/null
+++ b/src/common/utils/sync-box/channel-listener.injectable.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { syncBoxChannel } from "./channels";
+import { getMessageChannelListenerInjectable } from "../channel/message-channel-listener-injection-token";
+import syncBoxStateInjectable from "./sync-box-state.injectable";
+
+const syncBoxChannelListenerInjectable = getMessageChannelListenerInjectable({
+  id: "init",
+  channel: syncBoxChannel,
+  handler: (di) => ({ id, value }) => di.inject(syncBoxStateInjectable, id).set(value),
+});
+
+export default syncBoxChannelListenerInjectable;
diff --git a/src/common/utils/sync-box/channels.ts b/src/common/utils/sync-box/channels.ts
new file mode 100644
index 0000000000..4df0462dc3
--- /dev/null
+++ b/src/common/utils/sync-box/channels.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { MessageChannel } from "../channel/message-channel-listener-injection-token";
+import type { RequestChannel } from "../channel/request-channel-listener-injection-token";
+
+export type SyncBoxChannel = MessageChannel<{ id: string; value: any }>;
+
+export const syncBoxChannel: SyncBoxChannel = {
+  id: "sync-box-channel",
+};
+
+export type SyncBoxInitialValueChannel = RequestChannel<
+  void,
+  { id: string; value: any }[]
+>;
+
+export const syncBoxInitialValueChannel: SyncBoxInitialValueChannel = {
+  id: "sync-box-initial-value-channel",
+};
diff --git a/src/common/utils/sync-box/create-sync-box.injectable.ts b/src/common/utils/sync-box/create-sync-box.injectable.ts
index 1328106e24..4a01fe71a0 100644
--- a/src/common/utils/sync-box/create-sync-box.injectable.ts
+++ b/src/common/utils/sync-box/create-sync-box.injectable.ts
@@ -5,17 +5,17 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { IObservableValue } from "mobx";
 import { computed } from "mobx";
-import syncBoxChannelInjectable from "./sync-box-channel.injectable";
-import { messageToChannelInjectionToken } from "../channel/message-to-channel-injection-token";
+import { syncBoxChannel } from "./channels";
+import { sendMessageToChannelInjectionToken } from "../channel/message-to-channel-injection-token";
 import syncBoxStateInjectable from "./sync-box-state.injectable";
 import type { SyncBox } from "./sync-box-injection-token";
+import { toJS } from "../toJS";
 
 const createSyncBoxInjectable = getInjectable({
   id: "create-sync-box",
 
   instantiate: (di) => {
-    const syncBoxChannel = di.inject(syncBoxChannelInjectable);
-    const messageToChannel = di.inject(messageToChannelInjectionToken);
+    const messageToChannel = di.inject(sendMessageToChannelInjectionToken);
     const getSyncBoxState = (id: string) => di.inject(syncBoxStateInjectable, id);
 
     return <Value>(id: string, initialValue: Value): SyncBox<Value> => {
@@ -26,7 +26,7 @@ const createSyncBoxInjectable = getInjectable({
       return {
         id,
 
-        value: computed(() => state.get()),
+        value: computed(() => toJS(state.get())),
 
         set: (value) => {
           state.set(value);
diff --git a/src/common/utils/sync-box/handler.injectable.ts b/src/common/utils/sync-box/handler.injectable.ts
new file mode 100644
index 0000000000..f520585474
--- /dev/null
+++ b/src/common/utils/sync-box/handler.injectable.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { MessageChannelHandler } from "../channel/message-channel-listener-injection-token";
+import type { SyncBoxChannel } from "./channels";
+import syncBoxStateInjectable from "./sync-box-state.injectable";
+
+const syncBoxChannelHandlerInjectable = getInjectable({
+  id: "sync-box-channel-handler",
+  instantiate: (di): MessageChannelHandler<SyncBoxChannel> => {
+    const getSyncBoxState = (id: string) => di.inject(syncBoxStateInjectable, id);
+
+    return ({ id, value }) => getSyncBoxState(id)?.set(value);
+  },
+});
+
+export default syncBoxChannelHandlerInjectable;
diff --git a/src/common/utils/sync-box/sync-box-channel-listener.injectable.ts b/src/common/utils/sync-box/sync-box-channel-listener.injectable.ts
deleted file mode 100644
index b603c85997..0000000000
--- a/src/common/utils/sync-box/sync-box-channel-listener.injectable.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { SyncBoxChannel } from "./sync-box-channel.injectable";
-import syncBoxChannelInjectable from "./sync-box-channel.injectable";
-import syncBoxStateInjectable from "./sync-box-state.injectable";
-import type { MessageChannelListener } from "../channel/message-channel-listener-injection-token";
-import { messageChannelListenerInjectionToken } from "../channel/message-channel-listener-injection-token";
-
-const syncBoxChannelListenerInjectable = getInjectable({
-  id: "sync-box-channel-listener",
-
-  instantiate: (di): MessageChannelListener<SyncBoxChannel> => {
-    const getSyncBoxState = (id: string) => di.inject(syncBoxStateInjectable, id);
-    const channel = di.inject(syncBoxChannelInjectable);
-
-    return {
-      channel,
-
-      handler: ({ id, value }) => {
-        const target = getSyncBoxState(id);
-
-        if (target) {
-          target.set(value);
-        }
-      },
-    };
-  },
-
-  injectionToken: messageChannelListenerInjectionToken,
-});
-
-export default syncBoxChannelListenerInjectable;
diff --git a/src/common/utils/sync-box/sync-box-channel.injectable.ts b/src/common/utils/sync-box/sync-box-channel.injectable.ts
deleted file mode 100644
index 9389a99867..0000000000
--- a/src/common/utils/sync-box/sync-box-channel.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { MessageChannel } from "../channel/message-channel-injection-token";
-import { messageChannelInjectionToken } from "../channel/message-channel-injection-token";
-
-export type SyncBoxChannel = MessageChannel<{ id: string; value: any }>;
-
-const syncBoxChannelInjectable = getInjectable({
-  id: "sync-box-channel",
-
-  instantiate: (): SyncBoxChannel => ({
-    id: "sync-box-channel",
-  }),
-
-  injectionToken: messageChannelInjectionToken,
-});
-
-export default syncBoxChannelInjectable;
diff --git a/src/common/utils/sync-box/sync-box-initial-value-channel.injectable.ts b/src/common/utils/sync-box/sync-box-initial-value-channel.injectable.ts
deleted file mode 100644
index 89374c3565..0000000000
--- a/src/common/utils/sync-box/sync-box-initial-value-channel.injectable.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { RequestChannel } from "../channel/request-channel-injection-token";
-import { requestChannelInjectionToken } from "../channel/request-channel-injection-token";
-
-export type SyncBoxInitialValueChannel = RequestChannel<
-  void,
-  { id: string; value: any }[]
->;
-
-const syncBoxInitialValueChannelInjectable = getInjectable({
-  id: "sync-box-initial-value-channel",
-
-  instantiate: (): SyncBoxInitialValueChannel => ({
-    id: "sync-box-initial-value-channel",
-  }),
-
-  injectionToken: requestChannelInjectionToken,
-});
-
-export default syncBoxInitialValueChannelInjectable;
diff --git a/src/common/utils/tar.ts b/src/common/utils/tar.ts
index d351ec2507..3102098976 100644
--- a/src/common/utils/tar.ts
+++ b/src/common/utils/tar.ts
@@ -5,7 +5,6 @@
 
 // Helper for working with tarball files (.tar, .tgz)
 // Docs: https://github.com/npm/node-tar
-import type { ExtractOptions, FileStat } from "tar";
 import tar from "tar";
 import path from "path";
 import { parse } from "./json";
@@ -35,7 +34,7 @@ export function readFileFromTar<ParseJson extends boolean>({ tarPath, filePath,
       file: tarPath,
       filter: entryPath => path.normalize(entryPath) === filePath,
       sync: true,
-      onentry(entry: FileStat) {
+      onentry(entry) {
         entry.on("data", chunk => {
           fileChunks.push(chunk);
         });
@@ -62,18 +61,10 @@ export async function listTarEntries(filePath: string): Promise<string[]> {
 
   await tar.list({
     file: filePath,
-    onentry: (entry: FileStat) => {
-      entries.push(path.normalize(entry.path as unknown as string));
+    onentry: (entry) => {
+      entries.push(path.normalize(entry.path));
     },
   });
 
   return entries;
 }
-
-export function extractTar(filePath: string, opts: ExtractOptions & { sync?: boolean } = {}) {
-  return tar.extract({
-    file: filePath,
-    cwd: path.dirname(filePath),
-    ...opts,
-  });
-}
diff --git a/src/common/utils/tentative-parse-json.ts b/src/common/utils/tentative-parse-json.ts
deleted file mode 100644
index a0cb089a74..0000000000
--- a/src/common/utils/tentative-parse-json.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { pipeline } from "@ogre-tools/fp";
-import { defaultTo } from "lodash/fp";
-import { withErrorSuppression } from "./with-error-suppression/with-error-suppression";
-
-export const tentativeParseJson = (toBeParsed: any) => pipeline(
-  toBeParsed,
-  withErrorSuppression(JSON.parse),
-  defaultTo(toBeParsed),
-);
-
-
diff --git a/src/common/utils/tentative-stringify-json.ts b/src/common/utils/tentative-stringify-json.ts
deleted file mode 100644
index dc7206be7c..0000000000
--- a/src/common/utils/tentative-stringify-json.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { pipeline } from "@ogre-tools/fp";
-import { defaultTo } from "lodash/fp";
-import { withErrorSuppression } from "./with-error-suppression/with-error-suppression";
-
-export const tentativeStringifyJson = (toBeParsed: any) => pipeline(
-  toBeParsed,
-  withErrorSuppression(JSON.stringify),
-  defaultTo(toBeParsed),
-);
-
-
diff --git a/src/common/utils/type-narrowing.ts b/src/common/utils/type-narrowing.ts
index eb5b6996cf..936fb48816 100644
--- a/src/common/utils/type-narrowing.ts
+++ b/src/common/utils/type-narrowing.ts
@@ -35,6 +35,15 @@ export function hasTypedProperty<S extends object, K extends PropertyKey, V>(val
   return hasOwnProperty(val, key) && isValid(val[key]);
 }
 
+/**
+ * Narrows `val` to include the property `key` with type string
+ * @param val the value that we are trying to type narrow
+ * @param key The key to test if it is present on the object (must be a literal for tsc to do any meaningful typing)
+ */
+export function hasStringProperty<S extends object, K extends PropertyKey>(val: S, key: K): val is (S & { [key in K]: string }) {
+  return hasOwnProperty(val, key) && isString(val[key]);
+}
+
 /**
  * Narrows `val` to include the property `key` with type `V | undefined` or doesn't contain it
  * @param val the value that we are trying to type narrow
@@ -103,7 +112,7 @@ export function isBoolean(val: unknown): val is boolean {
  * checks if val is of type object and isn't null
  * @param val the value to be checked
  */
-export function isObject(val: unknown): val is object {
+export function isObject(val: unknown): val is Record<string | symbol | number, unknown> {
   return typeof val === "object" && val !== null;
 }
 
diff --git a/src/common/utils/with-error-logging/with-error-logging.test.ts b/src/common/utils/with-error-logging/with-error-logging.test.ts
index b14b7278e9..b1140d4e54 100644
--- a/src/common/utils/with-error-logging/with-error-logging.test.ts
+++ b/src/common/utils/with-error-logging/with-error-logging.test.ts
@@ -4,28 +4,25 @@
  */
 
 import { getDiForUnitTesting } from "../../../main/getDiForUnitTesting";
-import loggerInjectable from "../../logger.injectable";
-import type { Logger } from "../../logger";
 import withErrorLoggingInjectable from "./with-error-logging.injectable";
 import { pipeline } from "@ogre-tools/fp";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import { getPromiseStatus } from "../../test-utils/get-promise-status";
+import logErrorInjectable from "../../log-error.injectable";
 
 describe("with-error-logging", () => {
   describe("given decorated sync function", () => {
-    let loggerStub: Logger;
     let toBeDecorated: jest.Mock<number | undefined, [string, string]>;
     let decorated: (a: string, b: string) => number | undefined;
+    let logErrorMock: jest.Mock;
 
     beforeEach(() => {
       const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-      loggerStub = {
-        error: jest.fn(),
-      } as unknown as Logger;
+      logErrorMock = jest.fn();
 
-      di.override(loggerInjectable, () => loggerStub);
+      di.override(logErrorInjectable, () => logErrorMock);
 
       const withErrorLoggingFor = di.inject(withErrorLoggingInjectable);
 
@@ -52,7 +49,7 @@ describe("with-error-logging", () => {
       });
 
       it("does not log error", () => {
-        expect(loggerStub.error).not.toHaveBeenCalled();
+        expect(logErrorMock).not.toHaveBeenCalled();
       });
 
       it("returns the value", () => {
@@ -75,7 +72,7 @@ describe("with-error-logging", () => {
       });
 
       it("does not log error", () => {
-        expect(loggerStub.error).not.toHaveBeenCalled();
+        expect(logErrorMock).not.toHaveBeenCalled();
       });
 
       it("returns nothing", () => {
@@ -104,7 +101,7 @@ describe("with-error-logging", () => {
       });
 
       it("logs the error", () => {
-        expect(loggerStub.error).toHaveBeenCalledWith("some-error-message-for-some-error", error);
+        expect(logErrorMock).toHaveBeenCalledWith("some-error-message-for-some-error", error);
       });
 
       it("throws", () => {
@@ -114,18 +111,16 @@ describe("with-error-logging", () => {
   });
 
   describe("given decorated async function", () => {
-    let loggerStub: Logger;
     let decorated: (a: string, b: string) => Promise<number | undefined>;
     let toBeDecorated: AsyncFnMock<typeof decorated>;
+    let logErrorMock: jest.Mock;
 
     beforeEach(() => {
       const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-      loggerStub = {
-        error: jest.fn(),
-      } as unknown as Logger;
+      logErrorMock = jest.fn();
 
-      di.override(loggerInjectable, () => loggerStub);
+      di.override(logErrorInjectable, () => logErrorMock);
 
       const withErrorLoggingFor = di.inject(withErrorLoggingInjectable);
 
@@ -153,7 +148,7 @@ describe("with-error-logging", () => {
       });
 
       it("does not log error yet", () => {
-        expect(loggerStub.error).not.toHaveBeenCalled();
+        expect(logErrorMock).not.toHaveBeenCalled();
       });
 
       it("does not resolve yet", async () => {
@@ -176,7 +171,7 @@ describe("with-error-logging", () => {
             error = e;
           }
 
-          expect(loggerStub.error).toHaveBeenCalledWith("some-error-message-for-some-error", error);
+          expect(logErrorMock).toHaveBeenCalledWith("some-error-message-for-some-error", error);
         });
 
         it("rejects", () => {
@@ -198,7 +193,7 @@ describe("with-error-logging", () => {
         });
 
         it("logs the rejection", () => {
-          expect(loggerStub.error).toHaveBeenCalledWith(
+          expect(logErrorMock).toHaveBeenCalledWith(
             "some-error-message-for-some-rejection",
             error,
           );
@@ -215,7 +210,7 @@ describe("with-error-logging", () => {
         });
 
         it("does not log error", () => {
-          expect(loggerStub.error).not.toHaveBeenCalled();
+          expect(logErrorMock).not.toHaveBeenCalled();
         });
 
         it("resolves with the value", async () => {
@@ -231,7 +226,7 @@ describe("with-error-logging", () => {
         });
 
         it("does not log error", () => {
-          expect(loggerStub.error).not.toHaveBeenCalled();
+          expect(logErrorMock).not.toHaveBeenCalled();
         });
 
         it("resolves without value", async () => {
diff --git a/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts b/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts
index cea88b2352..51ebc18e13 100644
--- a/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts
+++ b/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts
@@ -5,21 +5,20 @@
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import { getDiForUnitTesting } from "../../../main/getDiForUnitTesting";
-import loggerInjectable from "../../logger.injectable";
-import type { Logger } from "../../logger";
 import withOrphanPromiseInjectable from "./with-orphan-promise.injectable";
+import logErrorInjectable from "../../log-error.injectable";
 
 describe("with orphan promise, when called", () => {
   let toBeDecorated: AsyncFnMock<(arg1: string, arg2: string) => Promise<string>>;
   let actual: void;
-  let loggerStub: Logger;
+  let logErrorMock: jest.Mock;
 
   beforeEach(() => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    loggerStub = { error: jest.fn() } as unknown as Logger;
+    logErrorMock = jest.fn();
 
-    di.override(loggerInjectable, () => loggerStub);
+    di.override(logErrorInjectable, () => logErrorMock);
 
     const withOrphanPromise = di.inject(withOrphanPromiseInjectable);
 
@@ -49,7 +48,7 @@ describe("with orphan promise, when called", () => {
     });
 
     it("logs the rejection", () => {
-      expect(loggerStub.error).toHaveBeenCalledWith("Orphan promise rejection encountered", "some-error");
+      expect(logErrorMock).toHaveBeenCalledWith("Orphan promise rejection encountered", "some-error");
     });
 
     it("nothing else happens", () => {
diff --git a/src/common/vars.ts b/src/common/vars.ts
index be8b472a5d..fe568b5b86 100644
--- a/src/common/vars.ts
+++ b/src/common/vars.ts
@@ -4,10 +4,7 @@
  */
 
 // App's common configuration for any process (main, renderer, build pipeline, etc.)
-import path from "path";
-import packageInfo from "../../package.json";
 import type { ThemeId } from "../renderer/themes/store";
-import { lazyInitialized } from "./utils/lazy-initialized";
 
 /**
  * @deprecated Switch to using isMacInjectable
@@ -24,8 +21,10 @@ export const isWindows = process.platform === "win32";
  */
 export const isLinux = process.platform === "linux";
 
+/**
+ * @deprecated switch to using `isDebuggingInjectable`
+ */
 export const isDebugging = ["true", "1", "yes", "y", "on"].includes((process.env.DEBUG ?? "").toLowerCase());
-export const isSnap = !!process.env.SNAP;
 
 /**
  * @deprecated Switch to using isTestEnvInjectable
@@ -42,85 +41,11 @@ export const isProduction = process.env.NODE_ENV === "production";
  */
 export const isDevelopment = !isTestEnv && !isProduction;
 
-export const productName = packageInfo.productName;
-
-/**
- * @deprecated Switch to using appNameInjectable
- */
-export const appName = `${packageInfo.productName}${isDevelopment ? "Dev" : ""}`;
-
 export const publicPath = "/build/" as string;
 export const defaultThemeId: ThemeId = "lens-dark";
 export const defaultFontSize = 12;
 export const defaultTerminalFontFamily = "RobotoMono";
 export const defaultEditorFontFamily = "RobotoMono";
-/**
- * @deprecated use `di.inject(normalizedPlatformInjectable)` instead
- */
-export const normalizedPlatform = (() => {
-  switch (process.platform) {
-    case "darwin":
-      return "darwin";
-    case "linux":
-      return "linux";
-    case "win32":
-      return "windows";
-    default:
-      throw new Error(`platform=${process.platform} is unsupported`);
-  }
-})();
-/**
- * @deprecated use `di.inject(bundledBinariesNormalizedArchInjectable)` instead
- */
-export const normalizedArch = (() => {
-  switch (process.arch) {
-    case "arm64":
-      return "arm64";
-    case "x64":
-    case "amd64":
-      return "x64";
-    case "386":
-    case "x32":
-    case "ia32":
-      return "ia32";
-    default:
-      throw new Error(`arch=${process.arch} is unsupported`);
-  }
-})();
-
-export function getBinaryName(name: string, { forPlatform = normalizedPlatform } = {}): string {
-  if (forPlatform === "windows") {
-    return `${name}.exe`;
-  }
-
-  return name;
-}
-
-const resourcesDir = lazyInitialized(() => (
-  isProduction
-    ? process.resourcesPath
-    : path.join(process.cwd(), "binaries", "client", normalizedPlatform)
-));
-
-/**
- * @deprecated for being explicit side effect.
- */
-export const baseBinariesDir = lazyInitialized(() => path.join(resourcesDir.get(), normalizedArch));
-
-/**
- * @deprecated for being explicit side effect.
- */
-export const kubeAuthProxyBinaryName = getBinaryName("lens-k8s-proxy");
-
-/**
- * @deprecated for being explicit side effect.
- */
-export const helmBinaryName = getBinaryName("helm");
-
-/**
- * @deprecated for being explicit side effect.
- */
-export const helmBinaryPath = lazyInitialized(() => path.join(baseBinariesDir.get(), helmBinaryName));
 
 // Apis
 export const apiPrefix = "/api"; // local router apis
@@ -129,7 +54,7 @@ export const apiKubePrefix = "/api-kube"; // k8s cluster apis
 // Links
 export const issuesTrackerUrl = "https://github.com/lensapp/lens/issues" as string;
 export const slackUrl = "https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ" as string;
-export const supportUrl = "https://docs.k8slens.dev/latest/support/" as string;
+export const supportUrl = "https://docs.k8slens.dev/support/" as string;
 
 export const lensWebsiteWeblinkId = "lens-website-link";
 export const lensDocumentationWeblinkId = "lens-documentation-link";
@@ -138,7 +63,4 @@ export const lensTwitterWeblinkId = "lens-twitter-link";
 export const lensBlogWeblinkId = "lens-blog-link";
 export const kubernetesDocumentationWeblinkId = "kubernetes-documentation-link";
 
-export const docsUrl = "https://docs.k8slens.dev/main" as string;
-
-export const sentryDsn = packageInfo.config?.sentryDsn ?? "";
-export const contentSecurityPolicy = packageInfo.config?.contentSecurityPolicy ?? "";
+export const docsUrl = "https://docs.k8slens.dev" as string;
diff --git a/src/main/app-paths/app-name/app-name.injectable.ts b/src/common/vars/app-name.injectable.ts
similarity index 83%
rename from src/main/app-paths/app-name/app-name.injectable.ts
rename to src/common/vars/app-name.injectable.ts
index 0a1db468d8..4d6d87421c 100644
--- a/src/main/app-paths/app-name/app-name.injectable.ts
+++ b/src/common/vars/app-name.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import isDevelopmentInjectable from "../../../common/vars/is-development.injectable";
+import isDevelopmentInjectable from "./is-development.injectable";
 import productNameInjectable from "./product-name.injectable";
 
 const appNameInjectable = getInjectable({
@@ -15,8 +15,6 @@ const appNameInjectable = getInjectable({
 
     return `${productName}${isDevelopment ? "Dev" : ""}`;
   },
-
-  causesSideEffects: true,
 });
 
 export default appNameInjectable;
diff --git a/src/common/vars/app-semantic-version.injectable.ts b/src/common/vars/app-semantic-version.injectable.ts
deleted file mode 100644
index ae68ea828d..0000000000
--- a/src/common/vars/app-semantic-version.injectable.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { SemVer } from "semver";
-import appVersionInjectable from "./app-version.injectable";
-
-const appSemanticVersionInjectable = getInjectable({
-  id: "app-semantic-version",
-  instantiate: (di) => new SemVer(di.inject(appVersionInjectable)),
-});
-
-export default appSemanticVersionInjectable;
diff --git a/src/common/vars/app-version.injectable.ts b/src/common/vars/app-version.injectable.ts
deleted file mode 100644
index d7647f8318..0000000000
--- a/src/common/vars/app-version.injectable.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import packageJsonInjectable from "./package-json.injectable";
-
-const appVersionInjectable = getInjectable({
-  id: "app-version",
-  instantiate: (di) => di.inject(packageJsonInjectable).version,
-});
-
-export default appVersionInjectable;
diff --git a/src/common/vars/application-copyright.injectable.ts b/src/common/vars/application-copyright.injectable.ts
new file mode 100644
index 0000000000..cdac64855c
--- /dev/null
+++ b/src/common/vars/application-copyright.injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationInformationInjectable from "./application-information.injectable";
+
+const applicationCopyrightInjectable = getInjectable({
+  id: "application-copyright",
+  instantiate: (di) => di.inject(applicationInformationInjectable).copyright,
+});
+
+export default applicationCopyrightInjectable;
diff --git a/src/common/vars/application-description.injectable.ts b/src/common/vars/application-description.injectable.ts
new file mode 100644
index 0000000000..d6c4c9f79b
--- /dev/null
+++ b/src/common/vars/application-description.injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationInformationInjectable from "./application-information.injectable";
+
+const applicationDescriptionInjectable = getInjectable({
+  id: "application-description",
+  instantiate: (di) => di.inject(applicationInformationInjectable).description,
+});
+
+export default applicationDescriptionInjectable;
diff --git a/src/common/vars/application-information.global-override-for-injectable.ts b/src/common/vars/application-information.global-override-for-injectable.ts
new file mode 100644
index 0000000000..232a189ce1
--- /dev/null
+++ b/src/common/vars/application-information.global-override-for-injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import applicationInformationInjectable from "./application-information.injectable";
+
+export default getGlobalOverride(applicationInformationInjectable, () => ({
+  name: "some-product-name",
+  productName: "some-product-name",
+  version: "6.0.0",
+  build: {},
+  config: {
+    k8sProxyVersion: "0.2.1",
+    bundledKubectlVersion: "1.23.3",
+    bundledHelmVersion: "3.7.2",
+    sentryDsn: "",
+    contentSecurityPolicy: "script-src 'unsafe-eval' 'self'; frame-src http://*.localhost:*/; img-src * data:",
+    welcomeRoute: "/welcome",
+  },
+  copyright: "some-copyright-information",
+  description: "some-descriptive-text",
+}));
diff --git a/src/common/vars/application-information.injectable.ts b/src/common/vars/application-information.injectable.ts
new file mode 100644
index 0000000000..56dfcf9d7e
--- /dev/null
+++ b/src/common/vars/application-information.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import packageJson from "../../../package.json";
+
+export type ApplicationInformation = Pick<typeof packageJson, "version" | "config" | "productName" | "copyright" | "description" | "name"> & {
+  build: Partial<typeof packageJson["build"]> & { publish?: unknown[] };
+};
+
+const applicationInformationInjectable = getInjectable({
+  id: "application-information",
+  instantiate: (): ApplicationInformation => {
+    const { version, config, productName, build, copyright, description, name } = packageJson;
+
+    return { version, config, productName, build, copyright, description, name };
+  },
+  causesSideEffects: true,
+});
+
+export default applicationInformationInjectable;
diff --git a/src/common/vars/base-bundled-binaries-dir.injectable.ts b/src/common/vars/base-bundled-binaries-dir.injectable.ts
index f0d78482c8..968ccc5c5b 100644
--- a/src/common/vars/base-bundled-binaries-dir.injectable.ts
+++ b/src/common/vars/base-bundled-binaries-dir.injectable.ts
@@ -4,17 +4,17 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import bundledResourcesDirectoryInjectable from "./bundled-resources-dir.injectable";
-import getAbsolutePathInjectable from "../path/get-absolute-path.injectable";
 import normalizedPlatformArchitectureInjectable from "./normalized-platform-architecture.injectable";
+import joinPathsInjectable from "../path/join-paths.injectable";
 
 const baseBundledBinariesDirectoryInjectable = getInjectable({
   id: "base-bundled-binaries-directory",
   instantiate: (di) => {
     const bundledResourcesDirectory = di.inject(bundledResourcesDirectoryInjectable);
     const normalizedPlatformArchitecture = di.inject(normalizedPlatformArchitectureInjectable);
-    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
 
-    return getAbsolutePath(
+    return joinPaths(
       bundledResourcesDirectory,
       normalizedPlatformArchitecture,
     );
diff --git a/src/common/vars/build-semantic-version.injectable.ts b/src/common/vars/build-semantic-version.injectable.ts
new file mode 100644
index 0000000000..2a49327480
--- /dev/null
+++ b/src/common/vars/build-semantic-version.injectable.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectionToken } from "@ogre-tools/injectable";
+import { SemVer } from "semver";
+import type { InitializableState } from "../initializable-state/create";
+import { createInitializableState } from "../initializable-state/create";
+import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+
+export const buildVersionInjectionToken = getInjectionToken<InitializableState<string>>({
+  id: "build-version-token",
+});
+
+export const buildVersionChannel: RequestChannel<void, string> = {
+  id: "build-version",
+};
+
+const buildSemanticVersionInjectable = createInitializableState({
+  id: "build-semantic-version",
+  init: (di) => {
+    const buildVersion = di.inject(buildVersionInjectionToken);
+
+    return new SemVer(buildVersion.get());
+  },
+});
+
+export default buildSemanticVersionInjectable;
+
diff --git a/src/common/vars/bundled-kubectl-version.injectable.ts b/src/common/vars/bundled-kubectl-version.injectable.ts
new file mode 100644
index 0000000000..9542a79834
--- /dev/null
+++ b/src/common/vars/bundled-kubectl-version.injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationInformationInjectable from "./application-information.injectable";
+
+const bundledKubectlVersionInjectable = getInjectable({
+  id: "bundled-kubectl-version",
+  instantiate: (di) => di.inject(applicationInformationInjectable).config.bundledKubectlVersion,
+});
+
+export default bundledKubectlVersionInjectable;
diff --git a/src/common/vars/bundled-resources-dir.injectable.ts b/src/common/vars/bundled-resources-dir.injectable.ts
index e20a638384..2058b1d5d3 100644
--- a/src/common/vars/bundled-resources-dir.injectable.ts
+++ b/src/common/vars/bundled-resources-dir.injectable.ts
@@ -5,20 +5,20 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import isProductionInjectable from "./is-production.injectable";
 import normalizedPlatformInjectable from "./normalized-platform.injectable";
-import getAbsolutePathInjectable from "../path/get-absolute-path.injectable";
 import lensResourcesDirInjectable from "./lens-resources-dir.injectable";
+import joinPathsInjectable from "../path/join-paths.injectable";
 
 const bundledResourcesDirectoryInjectable = getInjectable({
   id: "bundled-resources-directory",
   instantiate: (di) => {
     const isProduction = di.inject(isProductionInjectable);
     const normalizedPlatform = di.inject(normalizedPlatformInjectable);
-    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
     const lensResourcesDir = di.inject(lensResourcesDirInjectable);
 
     return isProduction
       ? lensResourcesDir
-      : getAbsolutePath(lensResourcesDir, "binaries", "client", normalizedPlatform);
+      : joinPaths(lensResourcesDir, "binaries", "client", normalizedPlatform);
   },
 });
 
diff --git a/src/common/vars/content-security-policy.injectable.ts b/src/common/vars/content-security-policy.injectable.ts
new file mode 100644
index 0000000000..b6e1e0eb30
--- /dev/null
+++ b/src/common/vars/content-security-policy.injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationInformationInjectable from "./application-information.injectable";
+
+const contentSecurityPolicyInjectable = getInjectable({
+  id: "content-security-policy",
+  instantiate: (di) => di.inject(applicationInformationInjectable).config.contentSecurityPolicy,
+});
+
+export default contentSecurityPolicyInjectable;
diff --git a/src/common/vars/extension-api-version.injectable.ts b/src/common/vars/extension-api-version.injectable.ts
new file mode 100644
index 0000000000..4f7f4d9930
--- /dev/null
+++ b/src/common/vars/extension-api-version.injectable.ts
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { SemVer } from "semver";
+import applicationInformationInjectable from "./application-information.injectable";
+
+const extensionApiVersionInjectable = getInjectable({
+  id: "extension-api-version",
+  instantiate: (di) => {
+    const { major, minor, patch } = new SemVer(di.inject(applicationInformationInjectable).version);
+
+    return `${major}.${minor}.${patch}`;
+  },
+});
+
+export default extensionApiVersionInjectable;
diff --git a/src/common/app-event-bus/app-event-bus.global-override-for-injectable.ts b/src/common/vars/is-debugging.global-override-for-injectable.ts
similarity index 62%
rename from src/common/app-event-bus/app-event-bus.global-override-for-injectable.ts
rename to src/common/vars/is-debugging.global-override-for-injectable.ts
index 2cdd21c919..7aa500ff2e 100644
--- a/src/common/app-event-bus/app-event-bus.global-override-for-injectable.ts
+++ b/src/common/vars/is-debugging.global-override-for-injectable.ts
@@ -2,7 +2,8 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getGlobalOverride } from "../test-utils/get-global-override";
-import emitEventInjectable from "./emit-event.injectable";
 
-export default getGlobalOverride(emitEventInjectable, () => () => {});
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import isDebuggingInjectable from "./is-debugging.injectable";
+
+export default getGlobalOverride(isDebuggingInjectable, () => false);
diff --git a/src/common/vars/is-debugging.injectable.ts b/src/common/vars/is-debugging.injectable.ts
new file mode 100644
index 0000000000..079086e628
--- /dev/null
+++ b/src/common/vars/is-debugging.injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+
+const isDebuggingInjectable = getInjectable({
+  id: "is-debugging",
+  instantiate: () => ["true", "1", "yes", "y", "on"].includes((process.env.DEBUG ?? "").toLowerCase()),
+  causesSideEffects: true,
+});
+
+export default isDebuggingInjectable;
diff --git a/src/common/vars/is-snap-package.global-override-for-injectable.ts b/src/common/vars/is-snap-package.global-override-for-injectable.ts
new file mode 100644
index 0000000000..cb3ff0a6e9
--- /dev/null
+++ b/src/common/vars/is-snap-package.global-override-for-injectable.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../test-utils/get-global-override";
+import isSnapPackageInjectable from "./is-snap-package.injectable";
+
+export default getGlobalOverride(isSnapPackageInjectable, () => false);
diff --git a/src/common/vars/is-snap-package.injectable.ts b/src/common/vars/is-snap-package.injectable.ts
new file mode 100644
index 0000000000..a2c545870b
--- /dev/null
+++ b/src/common/vars/is-snap-package.injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+
+const isSnapPackageInjectable = getInjectable({
+  id: "is-snap",
+  instantiate: () => Boolean(process.env.SNAP),
+  causesSideEffects: true,
+});
+
+export default isSnapPackageInjectable;
diff --git a/src/common/vars/lens-resources-dir.injectable.ts b/src/common/vars/lens-resources-dir.injectable.ts
index c454afb005..9aebba19b3 100644
--- a/src/common/vars/lens-resources-dir.injectable.ts
+++ b/src/common/vars/lens-resources-dir.injectable.ts
@@ -11,9 +11,9 @@ const lensResourcesDirInjectable = getInjectable({
   instantiate: (di) => {
     const isProduction = di.inject(isProductionInjectable);
 
-    return !isProduction
-      ? process.cwd()
-      : process.resourcesPath;
+    return isProduction
+      ? process.resourcesPath
+      : process.cwd();
   },
 
   causesSideEffects: true,
diff --git a/src/common/vars/normalized-platform.injectable.ts b/src/common/vars/normalized-platform.injectable.ts
index cb34f1d2fa..ee1bf7fb74 100644
--- a/src/common/vars/normalized-platform.injectable.ts
+++ b/src/common/vars/normalized-platform.injectable.ts
@@ -5,10 +5,12 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import platformInjectable from "./platform.injectable";
 
+export type NormalizedPlatform = "darwin" | "linux" | "windows";
+
 const normalizedPlatformInjectable = getInjectable({
   id: "normalized-platform",
 
-  instantiate: (di) => {
+  instantiate: (di): NormalizedPlatform => {
     const platform = di.inject(platformInjectable);
 
     switch (platform) {
diff --git a/src/common/vars/platform.injectable.ts b/src/common/vars/platform.injectable.ts
index 11939a7f06..f2c681d657 100644
--- a/src/common/vars/platform.injectable.ts
+++ b/src/common/vars/platform.injectable.ts
@@ -4,9 +4,12 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 
+// Todo: OCP by creating distinct injectables for platforms.
+export const allPlatforms = ["win32", "darwin", "linux"] as const;
+
 const platformInjectable = getInjectable({
   id: "platform",
-  instantiate: () => process.platform,
+  instantiate: () => process.platform as typeof allPlatforms[number],
   causesSideEffects: true,
 });
 
diff --git a/src/main/app-paths/app-name/product-name.injectable.ts b/src/common/vars/product-name.injectable.ts
similarity index 65%
rename from src/main/app-paths/app-name/product-name.injectable.ts
rename to src/common/vars/product-name.injectable.ts
index 8c5c53bfba..910c6afa48 100644
--- a/src/main/app-paths/app-name/product-name.injectable.ts
+++ b/src/common/vars/product-name.injectable.ts
@@ -3,12 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import packageInfo from "../../../../package.json";
+import applicationInformationInjectable from "./application-information.injectable";
 
 const productNameInjectable = getInjectable({
   id: "product-name",
-  instantiate: () => packageInfo.productName,
-  causesSideEffects: true,
+  instantiate: (di) => di.inject(applicationInformationInjectable).productName,
 });
 
 export default productNameInjectable;
diff --git a/src/common/vars/release-channel.injectable.ts b/src/common/vars/release-channel.injectable.ts
new file mode 100644
index 0000000000..6554fbc0ac
--- /dev/null
+++ b/src/common/vars/release-channel.injectable.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { createInitializableState } from "../initializable-state/create";
+import buildSemanticVersionInjectable from "./build-semantic-version.injectable";
+import type { ReleaseChannel } from "../../features/application-update/common/update-channels";
+
+const releaseChannelInjectable = createInitializableState({
+  id: "release-channel",
+  init: (di): ReleaseChannel => {
+    const buildSemanticVersion = di.inject(buildSemanticVersionInjectable);
+    const currentReleaseChannel = buildSemanticVersion.get().prerelease[0];
+
+    switch (currentReleaseChannel) {
+      case "latest":
+      case "beta":
+      case "alpha":
+        return currentReleaseChannel;
+      default:
+        return "latest";
+    }
+  },
+});
+
+export default releaseChannelInjectable;
diff --git a/src/common/vars/sentry-dsn-url.injectable.ts b/src/common/vars/sentry-dsn-url.injectable.ts
new file mode 100644
index 0000000000..e33c2fd0de
--- /dev/null
+++ b/src/common/vars/sentry-dsn-url.injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationInformationInjectable from "./application-information.injectable";
+
+const sentryDataSourceNameInjectable = getInjectable({
+  id: "sentry-data-source-name",
+  instantiate: (di) => di.inject(applicationInformationInjectable).config.sentryDsn,
+});
+
+export default sentryDataSourceNameInjectable;
diff --git a/src/common/vars/static-files-directory.injectable.ts b/src/common/vars/static-files-directory.injectable.ts
index c881f12b97..e65e854e9c 100644
--- a/src/common/vars/static-files-directory.injectable.ts
+++ b/src/common/vars/static-files-directory.injectable.ts
@@ -3,17 +3,17 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import getAbsolutePathInjectable from "../path/get-absolute-path.injectable";
+import joinPathsInjectable from "../path/join-paths.injectable";
 import lensResourcesDirInjectable from "./lens-resources-dir.injectable";
 
 const staticFilesDirectoryInjectable = getInjectable({
   id: "static-files-directory",
 
   instantiate: (di) => {
-    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
     const lensResourcesDir = di.inject(lensResourcesDirInjectable);
 
-    return getAbsolutePath(lensResourcesDir, "static");
+    return joinPaths(lensResourcesDir, "static");
   },
 });
 
diff --git a/src/common/vars/store-migration-version.injectable.ts b/src/common/vars/store-migration-version.injectable.ts
new file mode 100644
index 0000000000..79ab1578a3
--- /dev/null
+++ b/src/common/vars/store-migration-version.injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationInformationInjectable from "./application-information.injectable";
+
+const storeMigrationVersionInjectable = getInjectable({
+  id: "store-migration-version",
+  instantiate: (di) => di.inject(applicationInformationInjectable).version,
+});
+
+export default storeMigrationVersionInjectable;
diff --git a/src/extensions/__tests__/is-compatible-extension.test.ts b/src/extensions/__tests__/is-compatible-extension.test.ts
index d581722139..f2ca144681 100644
--- a/src/extensions/__tests__/is-compatible-extension.test.ts
+++ b/src/extensions/__tests__/is-compatible-extension.test.ts
@@ -3,65 +3,53 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import assert from "assert";
-import semver from "semver";
 import { isCompatibleExtension } from "../extension-discovery/is-compatible-extension/is-compatible-extension";
 import type { LensExtensionManifest } from "../lens-extension";
 
 describe("Extension/App versions compatibility checks", () => {
   it("is compatible with exact version matching", () => {
-    expect(isCompatible({ extLensEngineVersion: "5.5.0", appVersion: "5.5.0" })).toBeTruthy();
+    expect(isCompatible({ extLensEngineVersion: "5.5.0", extensionApiVersion: "5.5.0" })).toBeTruthy();
   });
 
   it("is compatible with upper %PATCH versions of base app", () => {
-    expect(isCompatible({ extLensEngineVersion: "5.5.0", appVersion: "5.5.5" })).toBeTruthy();
+    expect(isCompatible({ extLensEngineVersion: "5.5.0", extensionApiVersion: "5.5.5" })).toBeTruthy();
   });
 
   it("is compatible with higher %MINOR version of base app", () => {
-    expect(isCompatible({ extLensEngineVersion: "5.5.0", appVersion: "5.6.0" })).toBeTruthy();
+    expect(isCompatible({ extLensEngineVersion: "5.5.0", extensionApiVersion: "5.6.0" })).toBeTruthy();
   });
 
   it("is not compatible with higher %MAJOR version of base app", () => {
-    expect(isCompatible({ extLensEngineVersion: "5.6.0", appVersion: "6.0.0" })).toBeFalsy(); // extension for lens@5 not compatible with lens@6
-    expect(isCompatible({ extLensEngineVersion: "6.0.0", appVersion: "5.6.0" })).toBeFalsy();
-  });
-
-  it("is compatible with lensEngine with prerelease", () => {
-    expect(isCompatible({
-      extLensEngineVersion: "^5.4.0-alpha.0",
-      appVersion: "5.5.0-alpha.0",
-    })).toBeTruthy();
+    expect(isCompatible({ extLensEngineVersion: "5.6.0", extensionApiVersion: "6.0.0" })).toBeFalsy(); // extension for lens@5 not compatible with lens@6
+    expect(isCompatible({ extLensEngineVersion: "6.0.0", extensionApiVersion: "5.6.0" })).toBeFalsy();
   });
 
   it("supports short version format for manifest.engines.lens", () => {
-    expect(isCompatible({ extLensEngineVersion: "5.5", appVersion: "5.5.1" })).toBeTruthy();
+    expect(isCompatible({ extLensEngineVersion: "5.5", extensionApiVersion: "5.5.1" })).toBeTruthy();
   });
 
   it("throws for incorrect or not supported version format", () => {
     expect(() => isCompatible({
       extLensEngineVersion: ">=2.0",
-      appVersion: "2.0",
+      extensionApiVersion: "2.0",
     })).toThrow(/Invalid format/i);
 
     expect(() => isCompatible({
       extLensEngineVersion: "~2.0",
-      appVersion: "2.0",
+      extensionApiVersion: "2.0",
     })).toThrow(/Invalid format/i);
 
     expect(() => isCompatible({
       extLensEngineVersion: "*",
-      appVersion: "1.0",
+      extensionApiVersion: "1.0",
     })).toThrow(/Invalid format/i);
   });
 });
 
-function isCompatible({ extLensEngineVersion = "^1.0", appVersion = "1.0" } = {}): boolean {
-  const appSemVer = semver.coerce(appVersion);
+function isCompatible({ extLensEngineVersion = "^1.0", extensionApiVersion = "1.0" } = {}): boolean {
   const extensionManifestMock = getExtensionManifestMock(extLensEngineVersion);
 
-  assert(appSemVer);
-
-  return isCompatibleExtension({ appSemVer })(extensionManifestMock);
+  return isCompatibleExtension({ extensionApiVersion })(extensionManifestMock);
 }
 
 function getExtensionManifestMock(lensEngine = "1.0"): LensExtensionManifest {
diff --git a/src/extensions/common-api/app.ts b/src/extensions/common-api/app.ts
index 6be9a193d1..92ecd19ef9 100644
--- a/src/extensions/common-api/app.ts
+++ b/src/extensions/common-api/app.ts
@@ -3,14 +3,65 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { getAppVersion } from "../../common/utils";
+import appNameInjectable from "../../common/vars/app-name.injectable";
+import isLinuxInjectable from "../../common/vars/is-linux.injectable";
+import isMacInjectable from "../../common/vars/is-mac.injectable";
+import isSnapPackageInjectable from "../../common/vars/is-snap-package.injectable";
+import isWindowsInjectable from "../../common/vars/is-windows.injectable";
 import { asLegacyGlobalFunctionForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api";
+import { getLegacyGlobalDiForExtensionApi } from "../as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import getEnabledExtensionsInjectable from "./get-enabled-extensions/get-enabled-extensions.injectable";
-import * as Preferences from "./user-preferences";
+import type { UserPreferenceExtensionItems } from "./user-preferences";
+import { Preferences } from "./user-preferences";
+import { slackUrl, issuesTrackerUrl } from "../../common/vars";
+import { buildVersionInjectionToken } from "../../common/vars/build-semantic-version.injectable";
 
-export const version = getAppVersion();
-export { isSnap, isWindows, isMac, isLinux, appName, slackUrl, issuesTrackerUrl } from "../../common/vars";
+export interface AppExtensionItems {
+  readonly Preferences: UserPreferenceExtensionItems;
+  readonly version: string;
+  readonly appName: string;
+  readonly slackUrl: string;
+  readonly issuesTrackerUrl: string;
+  readonly isSnap: boolean;
+  readonly isWindows: boolean;
+  readonly isMac: boolean;
+  readonly isLinux: boolean;
+  getEnabledExtensions: () => string[];
+}
 
-export const getEnabledExtensions = asLegacyGlobalFunctionForExtensionApi(getEnabledExtensionsInjectable);
+export const App: AppExtensionItems = {
+  Preferences,
+  getEnabledExtensions: asLegacyGlobalFunctionForExtensionApi(getEnabledExtensionsInjectable),
+  get version() {
+    const di = getLegacyGlobalDiForExtensionApi();
 
-export { Preferences };
+    return di.inject(buildVersionInjectionToken).get();
+  },
+  get appName() {
+    const di = getLegacyGlobalDiForExtensionApi();
+
+    return di.inject(appNameInjectable);
+  },
+  get isSnap() {
+    const di = getLegacyGlobalDiForExtensionApi();
+
+    return di.inject(isSnapPackageInjectable);
+  },
+  get isWindows() {
+    const di = getLegacyGlobalDiForExtensionApi();
+
+    return di.inject(isWindowsInjectable);
+  },
+  get isMac() {
+    const di = getLegacyGlobalDiForExtensionApi();
+
+    return di.inject(isMacInjectable);
+  },
+  get isLinux() {
+    const di = getLegacyGlobalDiForExtensionApi();
+
+    return di.inject(isLinuxInjectable);
+  },
+  slackUrl,
+  issuesTrackerUrl,
+};
diff --git a/src/extensions/common-api/event-bus.ts b/src/extensions/common-api/event-bus.ts
index c6d2a1a34b..d95e3f49d4 100644
--- a/src/extensions/common-api/event-bus.ts
+++ b/src/extensions/common-api/event-bus.ts
@@ -3,5 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-export { appEventBus } from "../../common/app-event-bus/event-bus";
+import appEventBusInjectable from "../../common/app-event-bus/app-event-bus.injectable";
+import { asLegacyGlobalForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
+
 export type { AppEvent } from "../../common/app-event-bus/event-bus";
+
+export const appEventBus = asLegacyGlobalForExtensionApi(appEventBusInjectable);
diff --git a/src/extensions/common-api/index.ts b/src/extensions/common-api/index.ts
index 0d07220d1d..6e4b39b1b7 100644
--- a/src/extensions/common-api/index.ts
+++ b/src/extensions/common-api/index.ts
@@ -4,10 +4,10 @@
  */
 
 // APIs
-import * as App from "./app";
+import { App } from "./app";
 import * as EventBus from "./event-bus";
 import * as Store from "./stores";
-import * as Util from "./utils";
+import { Util } from "./utils";
 import * as Catalog from "./catalog";
 import * as Types from "./types";
 import * as Proxy from "./proxy";
diff --git a/src/extensions/common-api/k8s-api.ts b/src/extensions/common-api/k8s-api.ts
index b09f977b1d..e5c7013bc7 100644
--- a/src/extensions/common-api/k8s-api.ts
+++ b/src/extensions/common-api/k8s-api.ts
@@ -7,20 +7,53 @@
 //       It is here to consolidate the common parts which are exported to `Main`
 //       and to `Renderer`
 
-export { ResourceStack } from "../../common/k8s/resource-stack";
 import apiManagerInjectable from "../../common/k8s-api/api-manager/manager.injectable";
+import createKubeApiForClusterInjectable from "../../common/k8s-api/create-kube-api-for-cluster.injectable";
+import createKubeApiForRemoteClusterInjectable from "../../common/k8s-api/create-kube-api-for-remote-cluster.injectable";
+import createResourceStackInjectable from "../../common/k8s/create-resource-stack.injectable";
+import type { ResourceApplyingStack } from "../../common/k8s/resource-stack";
+import { asLegacyGlobalFunctionForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api";
 import { asLegacyGlobalForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
+import type { KubernetesCluster } from "./catalog";
 
 export const apiManager = asLegacyGlobalForExtensionApi(apiManagerInjectable);
+export const forCluster = asLegacyGlobalFunctionForExtensionApi(createKubeApiForClusterInjectable);
+export const forRemoteCluster = asLegacyGlobalFunctionForExtensionApi(createKubeApiForRemoteClusterInjectable);
 
-export {
-  KubeApi,
-  forCluster,
-  forRemoteCluster,
-  type ILocalKubeApiConfig,
-  type IRemoteKubeApiConfig,
-  type IKubeApiCluster,
-} from "../../common/k8s-api/kube-api";
+export { KubeApi } from "../../common/k8s-api/kube-api";
+
+export const createResourceStack = asLegacyGlobalFunctionForExtensionApi(createResourceStackInjectable);
+
+/**
+ * @deprecated Switch to using `Common.createResourceStack` instead
+ */
+export class ResourceStack implements ResourceApplyingStack {
+  private readonly impl: ResourceApplyingStack;
+
+  constructor(cluster: KubernetesCluster, name: string) {
+    this.impl = createResourceStack(cluster, name);
+  }
+
+  kubectlApplyFolder(folderPath: string, templateContext?: any, extraArgs?: string[] | undefined): Promise<string> {
+    return this.impl.kubectlApplyFolder(folderPath, templateContext, extraArgs);
+  }
+
+  kubectlDeleteFolder(folderPath: string, templateContext?: any, extraArgs?: string[] | undefined): Promise<string> {
+    return this.impl.kubectlDeleteFolder(folderPath, templateContext, extraArgs);
+  }
+}
+
+/**
+ * @deprecated This type is unused
+ */
+export interface IKubeApiCluster {
+  metadata: {
+    uid: string;
+  };
+}
+
+export type { CreateKubeApiForRemoteClusterConfig as IRemoteKubeApiConfig } from "../../common/k8s-api/create-kube-api-for-remote-cluster.injectable";
+export type { CreateKubeApiForLocalClusterConfig as ILocalKubeApiConfig } from "../../common/k8s-api/create-kube-api-for-cluster.injectable";
 
 export {
   KubeObject,
@@ -35,6 +68,7 @@ export {
 } from "../../common/k8s-api/kube-object";
 
 export {
+  KubeJsonApi,
   type KubeJsonApiData,
 } from "../../common/k8s-api/kube-json-api";
 
diff --git a/src/extensions/common-api/registrations.ts b/src/extensions/common-api/registrations.ts
index 5f19ec495d..4bfda25170 100644
--- a/src/extensions/common-api/registrations.ts
+++ b/src/extensions/common-api/registrations.ts
@@ -4,7 +4,7 @@
  */
 export type { StatusBarRegistration } from "../../renderer/components/status-bar/status-bar-registration";
 export type { KubeObjectMenuRegistration, KubeObjectMenuComponents } from "../../renderer/components/kube-object-menu/kube-object-menu-registration";
-export type { AppPreferenceRegistration, AppPreferenceComponents } from "../../renderer/components/+preferences/app-preferences/app-preference-registration";
+export type { AppPreferenceRegistration, AppPreferenceComponents } from "../../features/preferences/renderer/compliance-for-legacy-extension-api/app-preference-registration";
 export type { KubeObjectDetailRegistration, KubeObjectDetailComponents } from "../../renderer/components/kube-object-details/kube-object-detail-registration";
 export type { KubeObjectStatusRegistration } from "../../renderer/components/kube-object-status-icon/kube-object-status-registration";
 export type { PageRegistration, RegisteredPage, PageParams, PageComponentProps, PageComponents, PageTarget } from "../registries/page-registry";
diff --git a/src/extensions/common-api/user-preferences.ts b/src/extensions/common-api/user-preferences.ts
index 2c44f6f604..3a0a93793b 100644
--- a/src/extensions/common-api/user-preferences.ts
+++ b/src/extensions/common-api/user-preferences.ts
@@ -4,10 +4,13 @@
  */
 
 import { UserStore } from "../../common/user-store";
-
-/**
- * Get the configured kubectl binaries path.
- */
-export function getKubectlPath(): string | undefined {
-  return UserStore.getInstance().kubectlBinariesPath;
+export interface UserPreferenceExtensionItems {
+  /**
+   * Get the configured kubectl binaries path.
+   */
+  getKubectlPath: () => string | undefined;
 }
+
+export const Preferences: UserPreferenceExtensionItems = {
+  getKubectlPath: () => UserStore.getInstance().kubectlBinariesPath,
+};
diff --git a/src/extensions/common-api/utils.ts b/src/extensions/common-api/utils.ts
index 3dea165238..a6dfdee447 100644
--- a/src/extensions/common-api/utils.ts
+++ b/src/extensions/common-api/utils.ts
@@ -4,14 +4,34 @@
  */
 
 import openLinkInBrowserInjectable from "../../common/utils/open-link-in-browser.injectable";
+import buildVersionInjectable from "../../main/vars/build-version/build-version.injectable";
 import { asLegacyGlobalFunctionForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api";
+import { getLegacyGlobalDiForExtensionApi } from "../as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
+import { Singleton } from "../../common/utils";
+import { prevDefault, stopPropagation } from "../../renderer/utils/prevDefault";
+import type { IClassName } from "../../renderer/utils/cssNames";
+import { cssNames } from "../../renderer/utils/cssNames";
 
-export { Singleton, getAppVersion } from "../../common/utils";
-export { prevDefault, stopPropagation } from "../../renderer/utils/prevDefault";
-export { cssNames } from "../../renderer/utils/cssNames";
+export interface UtilsExtensionItems {
+  Singleton: typeof Singleton;
+  prevDefault: <E extends React.SyntheticEvent | Event, R>(callback: (evt: E) => R) => (evt: E) => R;
+  stopPropagation: (evt: Event | React.SyntheticEvent) => void;
+  cssNames: (...classNames: IClassName[]) => string;
+  openExternal: (url: string) => Promise<void>;
+  openBrowser: (url: string) => Promise<void>;
+  getAppVersion: () => string;
+}
 
-/**
- * @deprecated Use {@link openBrowser} instead
- */
-export const openExternal = asLegacyGlobalFunctionForExtensionApi(openLinkInBrowserInjectable);
-export const openBrowser = asLegacyGlobalFunctionForExtensionApi(openLinkInBrowserInjectable);
+export const Util: UtilsExtensionItems = {
+  Singleton,
+  prevDefault,
+  stopPropagation,
+  cssNames,
+  openExternal: asLegacyGlobalFunctionForExtensionApi(openLinkInBrowserInjectable),
+  openBrowser: asLegacyGlobalFunctionForExtensionApi(openLinkInBrowserInjectable),
+  getAppVersion: () => {
+    const di = getLegacyGlobalDiForExtensionApi();
+
+    return di.inject(buildVersionInjectable).get();
+  },
+};
diff --git a/src/extensions/extension-discovery/extension-discovery.injectable.ts b/src/extensions/extension-discovery/extension-discovery.injectable.ts
index 48e9b225a0..09d0f3b0ae 100644
--- a/src/extensions/extension-discovery/extension-discovery.injectable.ts
+++ b/src/extensions/extension-discovery/extension-discovery.injectable.ts
@@ -16,25 +16,50 @@ import readJsonFileInjectable from "../../common/fs/read-json-file.injectable";
 import loggerInjectable from "../../common/logger.injectable";
 import pathExistsInjectable from "../../common/fs/path-exists.injectable";
 import watchInjectable from "../../common/fs/watch/watch.injectable";
+import accessPathInjectable from "../../common/fs/access-path.injectable";
+import copyInjectable from "../../common/fs/copy.injectable";
+import ensureDirInjectable from "../../common/fs/ensure-dir.injectable";
+import isProductionInjectable from "../../common/vars/is-production.injectable";
+import lstatInjectable from "../../common/fs/lstat.injectable";
+import readDirectoryInjectable from "../../common/fs/read-directory.injectable";
+import fileSystemSeparatorInjectable from "../../common/path/separator.injectable";
+import getBasenameOfPathInjectable from "../../common/path/get-basename.injectable";
+import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable";
+import getRelativePathInjectable from "../../common/path/get-relative-path.injectable";
+import joinPathsInjectable from "../../common/path/join-paths.injectable";
+import removePathInjectable from "../../common/fs/remove-path.injectable";
+import homeDirectoryPathInjectable from "../../common/os/home-directory-path.injectable";
 
 const extensionDiscoveryInjectable = getInjectable({
   id: "extension-discovery",
 
-  instantiate: (di) =>
-    new ExtensionDiscovery({
-      extensionLoader: di.inject(extensionLoaderInjectable),
-      extensionsStore: di.inject(extensionsStoreInjectable),
-      extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
-      isCompatibleExtension: di.inject(isCompatibleExtensionInjectable),
-      installExtension: di.inject(installExtensionInjectable),
-      installExtensions: di.inject(installExtensionsInjectable),
-      extensionPackageRootDirectory: di.inject(extensionPackageRootDirectoryInjectable),
-      staticFilesDirectory: di.inject(staticFilesDirectoryInjectable),
-      readJsonFile: di.inject(readJsonFileInjectable),
-      pathExists: di.inject(pathExistsInjectable),
-      watch: di.inject(watchInjectable),
-      logger: di.inject(loggerInjectable),
-    }),
+  instantiate: (di) => new ExtensionDiscovery({
+    extensionLoader: di.inject(extensionLoaderInjectable),
+    extensionsStore: di.inject(extensionsStoreInjectable),
+    extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
+    isCompatibleExtension: di.inject(isCompatibleExtensionInjectable),
+    installExtension: di.inject(installExtensionInjectable),
+    installExtensions: di.inject(installExtensionsInjectable),
+    extensionPackageRootDirectory: di.inject(extensionPackageRootDirectoryInjectable),
+    staticFilesDirectory: di.inject(staticFilesDirectoryInjectable),
+    readJsonFile: di.inject(readJsonFileInjectable),
+    pathExists: di.inject(pathExistsInjectable),
+    watch: di.inject(watchInjectable),
+    logger: di.inject(loggerInjectable),
+    accessPath: di.inject(accessPathInjectable),
+    copy: di.inject(copyInjectable),
+    removePath: di.inject(removePathInjectable),
+    ensureDirectory: di.inject(ensureDirInjectable),
+    isProduction: di.inject(isProductionInjectable),
+    lstat: di.inject(lstatInjectable),
+    readDirectory: di.inject(readDirectoryInjectable),
+    fileSystemSeparator: di.inject(fileSystemSeparatorInjectable),
+    getBasenameOfPath: di.inject(getBasenameOfPathInjectable),
+    getDirnameOfPath: di.inject(getDirnameOfPathInjectable),
+    getRelativePath: di.inject(getRelativePathInjectable),
+    joinPaths: di.inject(joinPathsInjectable),
+    homeDirectoryPath: di.inject(homeDirectoryPathInjectable),
+  }),
 });
 
 export default extensionDiscoveryInjectable;
diff --git a/src/extensions/extension-discovery/extension-discovery.test.ts b/src/extensions/extension-discovery/extension-discovery.test.ts
index 7feca8f99d..f3630addaf 100644
--- a/src/extensions/extension-discovery/extension-discovery.test.ts
+++ b/src/extensions/extension-discovery/extension-discovery.test.ts
@@ -4,36 +4,39 @@
  */
 
 import type { FSWatcher } from "chokidar";
-import path from "path";
-import os from "os";
-import { Console } from "console";
 import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
 import extensionDiscoveryInjectable from "../extension-discovery/extension-discovery.injectable";
 import type { ExtensionDiscovery } from "../extension-discovery/extension-discovery";
 import installExtensionInjectable from "../extension-installer/install-extension/install-extension.injectable";
 import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
-import mockFs from "mock-fs";
 import { delay } from "../../renderer/utils";
-import { observable, when } from "mobx";
-import appVersionInjectable from "../../common/vars/app-version.injectable";
+import { observable, runInAction, when } from "mobx";
 import readJsonFileInjectable from "../../common/fs/read-json-file.injectable";
 import pathExistsInjectable from "../../common/fs/path-exists.injectable";
 import watchInjectable from "../../common/fs/watch/watch.injectable";
-
-console = new Console(process.stdout, process.stderr); // fix mockFS
+import extensionApiVersionInjectable from "../../common/vars/extension-api-version.injectable";
+import removePathInjectable from "../../common/fs/remove-path.injectable";
+import type { JoinPaths } from "../../common/path/join-paths.injectable";
+import joinPathsInjectable from "../../common/path/join-paths.injectable";
+import homeDirectoryPathInjectable from "../../common/os/home-directory-path.injectable";
 
 describe("ExtensionDiscovery", () => {
   let extensionDiscovery: ExtensionDiscovery;
   let readJsonFileMock: jest.Mock;
   let pathExistsMock: jest.Mock;
   let watchMock: jest.Mock;
+  let joinPaths: JoinPaths;
+  let homeDirectoryPath: string;
 
   beforeEach(() => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data");
     di.override(installExtensionInjectable, () => () => Promise.resolve());
-    di.override(appVersionInjectable, () => "5.0.0");
+    di.override(extensionApiVersionInjectable, () => "5.0.0");
+
+    joinPaths = di.inject(joinPathsInjectable);
+    homeDirectoryPath = di.inject(homeDirectoryPathInjectable);
 
     readJsonFileMock = jest.fn();
     di.override(readJsonFileInjectable, () => readJsonFileMock);
@@ -44,21 +47,17 @@ describe("ExtensionDiscovery", () => {
     watchMock = jest.fn();
     di.override(watchInjectable, () => watchMock);
 
-    mockFs();
+    di.override(removePathInjectable, () => async () => {}); // allow deleting files for now
 
     extensionDiscovery = di.inject(extensionDiscoveryInjectable);
   });
 
-  afterEach(() => {
-    mockFs.restore();
-  });
-
   it("emits add for added extension", async () => {
     const letTestFinish = observable.box(false);
     let addHandler!: (filePath: string) => void;
 
     readJsonFileMock.mockImplementation((p) => {
-      expect(p).toBe(path.join(os.homedir(), ".k8slens/extensions/my-extension/package.json"));
+      expect(p).toBe(joinPaths(homeDirectoryPath, ".k8slens/extensions/my-extension/package.json"));
 
       return {
         name: "my-extension",
@@ -89,7 +88,7 @@ describe("ExtensionDiscovery", () => {
     extensionDiscovery.events.on("add", extension => {
       expect(extension).toEqual({
         absolutePath: expect.any(String),
-        id: path.normalize("some-directory-for-user-data/node_modules/my-extension/package.json"),
+        id: "/some-directory-for-user-data/node_modules/my-extension/package.json",
         isBundled: false,
         isEnabled: false,
         isCompatible: true,
@@ -100,12 +99,12 @@ describe("ExtensionDiscovery", () => {
             lens: "5.0.0",
           },
         },
-        manifestPath: path.normalize("some-directory-for-user-data/node_modules/my-extension/package.json"),
+        manifestPath: "/some-directory-for-user-data/node_modules/my-extension/package.json",
       });
-      letTestFinish.set(true);
+      runInAction(() => letTestFinish.set(true));
     });
 
-    addHandler(path.join(extensionDiscovery.localFolderPath, "/my-extension/package.json"));
+    addHandler(joinPaths(extensionDiscovery.localFolderPath, "/my-extension/package.json"));
     await when(() => letTestFinish.get());
   });
 
@@ -133,7 +132,7 @@ describe("ExtensionDiscovery", () => {
 
     extensionDiscovery.events.on("add", onAdd);
 
-    addHandler(path.join(extensionDiscovery.localFolderPath, "/my-extension/node_modules/dep/package.json"));
+    addHandler(joinPaths(extensionDiscovery.localFolderPath, "/my-extension/node_modules/dep/package.json"));
 
     await delay(10);
 
diff --git a/src/extensions/extension-discovery/extension-discovery.ts b/src/extensions/extension-discovery/extension-discovery.ts
index 40df43ebdf..c7781d78a6 100644
--- a/src/extensions/extension-discovery/extension-discovery.ts
+++ b/src/extensions/extension-discovery/extension-discovery.ts
@@ -5,16 +5,12 @@
 
 import { ipcRenderer } from "electron";
 import { EventEmitter } from "events";
-import fse from "fs-extra";
 import { makeObservable, observable, reaction, when } from "mobx";
-import os from "os";
-import path from "path";
 import { broadcastMessage, ipcMainHandle, ipcRendererOn } from "../../common/ipc";
 import { isErrnoException, toJS } from "../../common/utils";
 import type { ExtensionsStore } from "../extensions-store/extensions-store";
 import type { ExtensionLoader } from "../extension-loader";
 import type { LensExtensionId, LensExtensionManifest } from "../lens-extension";
-import { isProduction } from "../../common/vars";
 import type { ExtensionInstallationStateStore } from "../extension-installation-state-store/extension-installation-state-store";
 import type { PackageJson } from "type-fest";
 import { extensionDiscoveryStateChannel } from "../../common/ipc/extension-handling";
@@ -23,20 +19,46 @@ import type { ReadJson } from "../../common/fs/read-json-file.injectable";
 import type { Logger } from "../../common/logger";
 import type { PathExists } from "../../common/fs/path-exists.injectable";
 import type { Watch } from "../../common/fs/watch/watch.injectable";
+import type { Stats } from "fs";
+import { constants } from "fs";
+import type { LStat } from "../../common/fs/lstat.injectable";
+import type { ReadDirectory } from "../../common/fs/read-directory.injectable";
+import type { EnsureDirectory } from "../../common/fs/ensure-dir.injectable";
+import type { AccessPath } from "../../common/fs/access-path.injectable";
+import type { Copy } from "../../common/fs/copy.injectable";
+import type { JoinPaths } from "../../common/path/join-paths.injectable";
+import type { GetBasenameOfPath } from "../../common/path/get-basename.injectable";
+import type { GetDirnameOfPath } from "../../common/path/get-dirname.injectable";
+import type { GetRelativePath } from "../../common/path/get-relative-path.injectable";
+import type { RemovePath } from "../../common/fs/remove-path.injectable";
+import type TypedEventEmitter from "typed-emitter";
 
 interface Dependencies {
-  extensionLoader: ExtensionLoader;
-  extensionsStore: ExtensionsStore;
-  extensionInstallationStateStore: ExtensionInstallationStateStore;
+  readonly extensionLoader: ExtensionLoader;
+  readonly extensionsStore: ExtensionsStore;
+  readonly extensionInstallationStateStore: ExtensionInstallationStateStore;
+  readonly extensionPackageRootDirectory: string;
+  readonly staticFilesDirectory: string;
+  readonly logger: Logger;
+  readonly isProduction: boolean;
+  readonly fileSystemSeparator: string;
+  readonly homeDirectoryPath: string;
   isCompatibleExtension: (manifest: LensExtensionManifest) => boolean;
   installExtension: (name: string) => Promise<void>;
   installExtensions: (packageJsonPath: string, packagesJson: PackageJson) => Promise<void>;
-  extensionPackageRootDirectory: string;
-  staticFilesDirectory: string;
   readJsonFile: ReadJson;
   pathExists: PathExists;
+  removePath: RemovePath;
+  lstat: LStat;
   watch: Watch;
-  logger: Logger;
+  readDirectory: ReadDirectory;
+  ensureDirectory: EnsureDirectory;
+  accessPath: AccessPath;
+  copy: Copy;
+  joinPaths: JoinPaths;
+  getBasenameOfPath: GetBasenameOfPath;
+  getDirnameOfPath: GetDirnameOfPath;
+  getRelativePath: GetRelativePath;
 }
 
 export interface InstalledExtension {
@@ -67,12 +89,17 @@ interface ExtensionDiscoveryChannelMessage {
  * Returns true if the lstat is for a directory-like file (e.g. isDirectory or symbolic link)
  * @param lstat the stats to compare
  */
-const isDirectoryLike = (lstat: fse.Stats) => lstat.isDirectory() || lstat.isSymbolicLink();
+const isDirectoryLike = (lstat: Stats) => lstat.isDirectory() || lstat.isSymbolicLink();
 
 interface LoadFromFolderOptions {
   isBundled?: boolean;
 }
 
+interface ExtensionDiscoveryEvents {
+  add: (ext: InstalledExtension) => void;
+  remove: (extId: LensExtensionId) => void;
+}
+
 /**
  * Discovers installed bundled and local extensions from the filesystem.
  * Also watches for added and removed local extensions by watching the directory.
@@ -96,30 +123,30 @@ export class ExtensionDiscovery {
     return when(() => this.isLoaded);
   }
 
-  public events = new EventEmitter();
+  public readonly events: TypedEventEmitter<ExtensionDiscoveryEvents> = new EventEmitter();
 
   constructor(protected readonly dependencies: Dependencies) {
     makeObservable(this);
   }
 
   get localFolderPath(): string {
-    return path.join(os.homedir(), ".k8slens", "extensions");
+    return this.dependencies.joinPaths(this.dependencies.homeDirectoryPath, ".k8slens", "extensions");
   }
 
   get packageJsonPath(): string {
-    return path.join(this.dependencies.extensionPackageRootDirectory, manifestFilename);
+    return this.dependencies.joinPaths(this.dependencies.extensionPackageRootDirectory, manifestFilename);
   }
 
   get inTreeTargetPath(): string {
-    return path.join(this.dependencies.extensionPackageRootDirectory, "extensions");
+    return this.dependencies.joinPaths(this.dependencies.extensionPackageRootDirectory, "extensions");
   }
 
   get inTreeFolderPath(): string {
-    return path.resolve(this.dependencies.staticFilesDirectory, "../extensions");
+    return this.dependencies.joinPaths(this.dependencies.staticFilesDirectory, "../extensions");
   }
 
   get nodeModulesPath(): string {
-    return path.join(this.dependencies.extensionPackageRootDirectory, "node_modules");
+    return this.dependencies.joinPaths(this.dependencies.extensionPackageRootDirectory, "node_modules");
   }
 
   /**
@@ -184,24 +211,24 @@ export class ExtensionDiscovery {
 
   handleWatchFileAdd = async (manifestPath: string): Promise<void> => {
     // e.g. "foo/package.json"
-    const relativePath = path.relative(this.localFolderPath, manifestPath);
+    const relativePath = this.dependencies.getRelativePath(this.localFolderPath, manifestPath);
 
     // Converts "foo/package.json" to ["foo", "package.json"], where length of 2 implies
     // that the added file is in a folder under local folder path.
     // This safeguards against a file watch being triggered under a sub-directory which is not an extension.
-    const isUnderLocalFolderPath = relativePath.split(path.sep).length === 2;
+    const isUnderLocalFolderPath = relativePath.split(this.dependencies.fileSystemSeparator).length === 2;
 
-    if (path.basename(manifestPath) === manifestFilename && isUnderLocalFolderPath) {
+    if (this.dependencies.getBasenameOfPath(manifestPath) === manifestFilename && isUnderLocalFolderPath) {
       try {
         this.dependencies.extensionInstallationStateStore.setInstallingFromMain(manifestPath);
-        const absPath = path.dirname(manifestPath);
+        const absPath = this.dependencies.getDirnameOfPath(manifestPath);
 
         // this.loadExtensionFromPath updates this.packagesJson
         const extension = await this.loadExtensionFromFolder(absPath);
 
         if (extension) {
           // Remove a broken symlink left by a previous installation if it exists.
-          await fse.remove(extension.manifestPath);
+          await this.dependencies.removePath(extension.manifestPath);
 
           // Install dependencies for the new extension
           await this.dependencies.installExtension(extension.absolutePath);
@@ -226,8 +253,8 @@ export class ExtensionDiscovery {
   handleWatchUnlinkEvent = async (filePath: string): Promise<void> => {
     // Check that the removed path is directly under this.localFolderPath
     // Note that the watcher can create unlink events for subdirectories of the extension
-    const extensionFolderName = path.basename(filePath);
-    const expectedPath = path.relative(this.localFolderPath, filePath);
+    const extensionFolderName = this.dependencies.getBasenameOfPath(filePath);
+    const expectedPath = this.dependencies.getRelativePath(this.localFolderPath, filePath);
 
     if (expectedPath !== extensionFolderName) {
       return;
@@ -264,7 +291,7 @@ export class ExtensionDiscovery {
    * @param name e.g. "@mirantis/lens-extension-cc"
    */
   removeSymlinkByPackageName(name: string): Promise<void> {
-    return fse.remove(this.getInstalledPath(name));
+    return this.dependencies.removePath(this.getInstalledPath(name));
   }
 
   /**
@@ -286,7 +313,7 @@ export class ExtensionDiscovery {
     await this.removeSymlinkByPackageName(manifest.name);
 
     // fs.remove does nothing if the path doesn't exist anymore
-    await fse.remove(absolutePath);
+    await this.dependencies.removePath(absolutePath);
   }
 
   async load(): Promise<Map<LensExtensionId, InstalledExtension>> {
@@ -301,34 +328,29 @@ export class ExtensionDiscovery {
       `${logModule} loading extensions from ${this.dependencies.extensionPackageRootDirectory}`,
     );
 
-    // fs.remove won't throw if path is missing
-    await fse.remove(path.join(this.dependencies.extensionPackageRootDirectory, "package-lock.json"));
+    await this.dependencies.removePath(this.dependencies.joinPaths(this.dependencies.extensionPackageRootDirectory, "package-lock.json"));
 
-    try {
-      // Verify write access to static/extensions, which is needed for symlinking
-      await fse.access(this.inTreeFolderPath, fse.constants.W_OK);
+    const canWriteToInTreeFolder = await this.dependencies.accessPath(this.inTreeFolderPath, constants.W_OK);
 
+    if (canWriteToInTreeFolder) {
       // Set bundled folder path to static/extensions
       this.bundledFolderPath = this.inTreeFolderPath;
-    } catch {
-      // If there is error accessing static/extensions, we need to copy in-tree extensions so that we can symlink them properly on "npm install".
-      // The error can happen if there is read-only rights to static/extensions, which would fail symlinking.
-
+    } else {
       // Remove e.g. /Users/<username>/Library/Application Support/LensDev/extensions
-      await fse.remove(this.inTreeTargetPath);
+      await this.dependencies.removePath(this.inTreeTargetPath);
 
       // Create folder e.g. /Users/<username>/Library/Application Support/LensDev/extensions
-      await fse.ensureDir(this.inTreeTargetPath);
+      await this.dependencies.ensureDirectory(this.inTreeTargetPath);
 
       // Copy static/extensions to e.g. /Users/<username>/Library/Application Support/LensDev/extensions
-      await fse.copy(this.inTreeFolderPath, this.inTreeTargetPath);
+      await this.dependencies.copy(this.inTreeFolderPath, this.inTreeTargetPath);
 
       // Set bundled folder path to e.g. /Users/<username>/Library/Application Support/LensDev/extensions
       this.bundledFolderPath = this.inTreeTargetPath;
     }
 
-    await fse.ensureDir(this.nodeModulesPath);
-    await fse.ensureDir(this.localFolderPath);
+    await this.dependencies.ensureDirectory(this.nodeModulesPath);
+    await this.dependencies.ensureDirectory(this.localFolderPath);
 
     const extensions = await this.ensureExtensions();
 
@@ -342,7 +364,7 @@ export class ExtensionDiscovery {
    * e.g. "/Users/<username>/Library/Application Support/Lens/node_modules/@publisher/extension"
    */
   protected getInstalledPath(name: string): string {
-    return path.join(this.nodeModulesPath, name);
+    return this.dependencies.joinPaths(this.nodeModulesPath, name);
   }
 
   /**
@@ -350,7 +372,7 @@ export class ExtensionDiscovery {
    * e.g. "/Users/<username>/Library/Application Support/Lens/node_modules/@publisher/extension/package.json"
    */
   protected getInstalledManifestPath(name: string): string {
-    return path.join(this.getInstalledPath(name), manifestFilename);
+    return this.dependencies.joinPaths(this.getInstalledPath(name), manifestFilename);
   }
 
   /**
@@ -362,9 +384,11 @@ export class ExtensionDiscovery {
       const manifest = await this.dependencies.readJsonFile(manifestPath) as unknown as LensExtensionManifest;
       const id = this.getInstalledManifestPath(manifest.name);
       const isEnabled = this.dependencies.extensionsStore.isEnabled({ id, isBundled });
-      const extensionDir = path.dirname(manifestPath);
-      const npmPackage = path.join(extensionDir, `${manifest.name}-${manifest.version}.tgz`);
-      const absolutePath = (isProduction && await this.dependencies.pathExists(npmPackage)) ? npmPackage : extensionDir;
+      const extensionDir = this.dependencies.getDirnameOfPath(manifestPath);
+      const npmPackage = this.dependencies.joinPaths(extensionDir, `${manifest.name}-${manifest.version}.tgz`);
+      const absolutePath = this.dependencies.isProduction && await this.dependencies.pathExists(npmPackage)
+        ? npmPackage
+        : extensionDir;
       const isCompatible = isBundled || this.dependencies.isCompatibleExtension(manifest);
 
       return {
@@ -390,28 +414,11 @@ export class ExtensionDiscovery {
 
   async ensureExtensions(): Promise<Map<LensExtensionId, InstalledExtension>> {
     const bundledExtensions = await this.loadBundledExtensions();
-
-    await this.installBundledPackages(this.packageJsonPath, bundledExtensions);
-
     const userExtensions = await this.loadFromFolder(this.localFolderPath, bundledExtensions.map((extension) => extension.manifest.name));
-
-    for (const extension of userExtensions) {
-      if (!(await this.dependencies.pathExists(extension.manifestPath))) {
-        try {
-          await this.dependencies.installExtension(extension.absolutePath);
-        } catch (error) {
-          const message = error instanceof Error
-            ? error.message
-            : String(error || "unknown error");
-          const { name, version } = extension.manifest;
-
-          this.dependencies.logger.error(`${logModule}: failed to install user extension ${name}@${version}: ${message}`);
-        }
-      }
-    }
-
     const extensions = bundledExtensions.concat(userExtensions);
 
+    await this.installBundledPackages(this.packageJsonPath, extensions);
+
     return this.extensions = new Map(extensions.map(extension => [extension.id, extension]));
   }
 
@@ -420,19 +427,22 @@ export class ExtensionDiscovery {
    */
   installBundledPackages(packageJsonPath: string, extensions: InstalledExtension[]): Promise<void> {
     const dependencies = Object.fromEntries(
-      extensions.map(extension => [extension.manifest.name, extension.absolutePath]),
+      extensions.filter(extension => extension.isBundled).map(extension => [extension.manifest.name, extension.absolutePath]),
+    );
+    const optionalDependencies = Object.fromEntries(
+      extensions.filter(extension => !extension.isBundled).map(extension => [extension.manifest.name, extension.absolutePath]),
     );
 
-    return this.dependencies.installExtensions(packageJsonPath, { dependencies });
+    return this.dependencies.installExtensions(packageJsonPath, { dependencies, optionalDependencies });
   }
 
   async loadBundledExtensions(): Promise<InstalledExtension[]> {
     const extensions: InstalledExtension[] = [];
     const folderPath = this.bundledFolderPath;
-    const paths = await fse.readdir(folderPath);
+    const paths = await this.dependencies.readDirectory(folderPath);
 
     for (const fileName of paths) {
-      const absPath = path.resolve(folderPath, fileName);
+      const absPath = this.dependencies.joinPaths(folderPath, fileName);
       const extension = await this.loadExtensionFromFolder(absPath, { isBundled: true });
 
       if (extension) {
@@ -446,7 +456,7 @@ export class ExtensionDiscovery {
 
   async loadFromFolder(folderPath: string, bundledExtensions: string[]): Promise<InstalledExtension[]> {
     const extensions: InstalledExtension[] = [];
-    const paths = await fse.readdir(folderPath);
+    const paths = await this.dependencies.readDirectory(folderPath);
 
     for (const fileName of paths) {
       // do not allow to override bundled extensions
@@ -454,17 +464,21 @@ export class ExtensionDiscovery {
         continue;
       }
 
-      const absPath = path.resolve(folderPath, fileName);
+      const absPath = this.dependencies.joinPaths(folderPath, fileName);
 
-      if (!fse.existsSync(absPath)) {
-        continue;
-      }
+      try {
+        const lstat = await this.dependencies.lstat(absPath);
 
-      const lstat = await fse.lstat(absPath);
+        // skip non-directories
+        if (!isDirectoryLike(lstat)) {
+          continue;
+        }
+      } catch (error) {
+        if (isErrnoException(error) && error.code === "ENOENT") {
+          continue;
+        }
 
-      // skip non-directories
-      if (!isDirectoryLike(lstat)) {
-        continue;
+        throw error;
       }
 
       const extension = await this.loadExtensionFromFolder(absPath);
@@ -484,7 +498,7 @@ export class ExtensionDiscovery {
    * @param folderPath Folder path to extension
    */
   async loadExtensionFromFolder(folderPath: string, { isBundled = false }: LoadFromFolderOptions = {}): Promise<InstalledExtension | null> {
-    const manifestPath = path.resolve(folderPath, manifestFilename);
+    const manifestPath = this.dependencies.joinPaths(folderPath, manifestFilename);
 
     return this.getByManifest(manifestPath, { isBundled });
   }
diff --git a/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts b/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts
index 75e2f45d4a..de2fd4390f 100644
--- a/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts
+++ b/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts
@@ -3,13 +3,13 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import appSemanticVersionInjectable from "../../../common/vars/app-semantic-version.injectable";
+import extensionApiVersionInjectable from "../../../common/vars/extension-api-version.injectable";
 import { isCompatibleExtension } from "./is-compatible-extension";
 
 const isCompatibleExtensionInjectable = getInjectable({
   id: "is-compatible-extension",
   instantiate: (di) => isCompatibleExtension({
-    appSemVer: di.inject(appSemanticVersionInjectable),
+    extensionApiVersion: di.inject(extensionApiVersionInjectable),
   }),
 });
 
diff --git a/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.ts b/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.ts
index 717effa1c6..74cbb4fd0c 100644
--- a/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.ts
+++ b/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.ts
@@ -2,16 +2,15 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import semver, { type SemVer } from "semver";
+import semver from "semver";
 import type { LensExtensionManifest } from "../../lens-extension";
 
 interface Dependencies {
-  appSemVer: SemVer;
+  extensionApiVersion: string;
 }
 
-export const isCompatibleExtension = ({ appSemVer }: Dependencies): ((manifest: LensExtensionManifest) => boolean) => {
+export const isCompatibleExtension = ({ extensionApiVersion }: Dependencies): ((manifest: LensExtensionManifest) => boolean) => {
   return (manifest: LensExtensionManifest): boolean => {
-    const appVersion = appSemVer.raw.split("-")[0]; // drop prerelease version if any, e.g. "-alpha.0"
     const manifestLensEngine = manifest.engines.lens;
     const validVersion = manifestLensEngine.match(/^[\^0-9]\d*\.\d+\b/); // must start from ^ or number
 
@@ -30,7 +29,7 @@ export const isCompatibleExtension = ({ appSemVer }: Dependencies): ((manifest:
     }) as semver.SemVer;
     const supportedVersionsByExtension = semver.validRange(`^${extMajor}.${extMinor}`) as string;
 
-    return semver.satisfies(appVersion, supportedVersionsByExtension, {
+    return semver.satisfies(extensionApiVersion, supportedVersionsByExtension, {
       loose: true,
       includePrerelease: false,
     });
diff --git a/src/extensions/extension-installer/extension-installer.ts b/src/extensions/extension-installer/extension-installer.ts
index a2781f15bc..de97c71f00 100644
--- a/src/extensions/extension-installer/extension-installer.ts
+++ b/src/extensions/extension-installer/extension-installer.ts
@@ -16,6 +16,16 @@ interface Dependencies {
   extensionPackageRootDirectory: string;
 }
 
+const baseNpmInstallArgs = [
+  "install",
+  "--audit=false",
+  "--fund=false",
+  // NOTE: we do not omit the `optional` dependencies because that is how we specify the non-bundled extensions
+  "--omit=dev",
+  "--omit=peer",
+  "--prefer-offline",
+];
+
 /**
  * Installs dependencies for extensions
  */
@@ -42,7 +52,7 @@ export class ExtensionInstaller {
       });
 
       logger.info(`${logModule} installing dependencies at ${this.dependencies.extensionPackageRootDirectory}`);
-      await this.npm(["install", "--no-audit", "--only=prod", "--prefer-offline", "--no-package-lock"]);
+      await this.npm(...baseNpmInstallArgs);
       logger.info(`${logModule} dependencies installed at ${this.dependencies.extensionPackageRootDirectory}`);
     } finally {
       this.installLock.release();
@@ -58,14 +68,14 @@ export class ExtensionInstaller {
 
     try {
       logger.info(`${logModule} installing package from ${name} to ${this.dependencies.extensionPackageRootDirectory}`);
-      await this.npm(["install", "--no-audit", "--only=prod", "--package-lock=false", "--prefer-offline", "--no-package-lock", name]);
+      await this.npm(...baseNpmInstallArgs, name);
       logger.info(`${logModule} package ${name} installed to ${this.dependencies.extensionPackageRootDirectory}`);
     } finally {
       this.installLock.release();
     }
   };
 
-  private npm(args: string[]): Promise<void> {
+  private npm(...args: string[]): Promise<void> {
     return new Promise((resolve, reject) => {
       const child = child_process.fork(this.npmPath, args, {
         cwd: this.dependencies.extensionPackageRootDirectory,
diff --git a/src/extensions/extension-loader/extension-loader.injectable.ts b/src/extensions/extension-loader/extension-loader.injectable.ts
index 7fe1cd5421..48edce4446 100644
--- a/src/extensions/extension-loader/extension-loader.injectable.ts
+++ b/src/extensions/extension-loader/extension-loader.injectable.ts
@@ -9,6 +9,9 @@ import { createExtensionInstanceInjectionToken } from "./create-extension-instan
 import extensionInstancesInjectable from "./extension-instances.injectable";
 import type { LensExtension } from "../lens-extension";
 import extensionInjectable from "./extension/extension.injectable";
+import loggerInjectable from "../../common/logger.injectable";
+import joinPathsInjectable from "../../common/path/join-paths.injectable";
+import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable";
 
 const extensionLoaderInjectable = getInjectable({
   id: "extension-loader",
@@ -18,6 +21,9 @@ const extensionLoaderInjectable = getInjectable({
     createExtensionInstance: di.inject(createExtensionInstanceInjectionToken),
     extensionInstances: di.inject(extensionInstancesInjectable),
     getExtension: (instance: LensExtension) => di.inject(extensionInjectable, instance),
+    logger: di.inject(loggerInjectable),
+    joinPaths: di.inject(joinPathsInjectable),
+    getDirnameOfPath: di.inject(getDirnameOfPathInjectable),
   }),
 });
 
diff --git a/src/extensions/extension-loader/extension-loader.ts b/src/extensions/extension-loader/extension-loader.ts
index 16b28de8e1..5c63451276 100644
--- a/src/extensions/extension-loader/extension-loader.ts
+++ b/src/extensions/extension-loader/extension-loader.ts
@@ -7,11 +7,9 @@ import { ipcMain, ipcRenderer } from "electron";
 import { isEqual } from "lodash";
 import type { ObservableMap } from "mobx";
 import { action, computed, makeObservable, observable, observe, reaction, when } from "mobx";
-import path from "path";
 import { broadcastMessage, ipcMainOn, ipcRendererOn, ipcMainHandle } from "../../common/ipc";
 import type { Disposer } from "../../common/utils";
 import { isDefined, toJS } from "../../common/utils";
-import logger from "../../main/logger";
 import type { InstalledExtension } from "../extension-discovery/extension-discovery";
 import type { LensExtension, LensExtensionConstructor, LensExtensionId } from "../lens-extension";
 import type { LensRendererExtension } from "../lens-renderer-extension";
@@ -23,14 +21,20 @@ import assert from "assert";
 import { EventEmitter } from "../../common/event-emitter";
 import type { CreateExtensionInstance } from "./create-extension-instance.token";
 import type { Extension } from "./extension/extension.injectable";
+import type { Logger } from "../../common/logger";
+import type { JoinPaths } from "../../common/path/join-paths.injectable";
+import type { GetDirnameOfPath } from "../../common/path/get-dirname.injectable";
 
 const logModule = "[EXTENSIONS-LOADER]";
 
 interface Dependencies {
+  readonly extensionInstances: ObservableMap<LensExtensionId, LensExtension>;
+  readonly logger: Logger;
   updateExtensionsState: (extensionsState: Record<LensExtensionId, LensExtensionState>) => void;
   createExtensionInstance: CreateExtensionInstance;
-  readonly extensionInstances: ObservableMap<LensExtensionId, LensExtension>;
   getExtension: (instance: LensExtension) => Extension;
+  joinPaths: JoinPaths;
+  getDirnameOfPath: GetDirnameOfPath;
 }
 
 export interface ExtensionLoading {
@@ -159,7 +163,7 @@ export class ExtensionLoader {
 
   @action
   removeInstance(lensExtensionId: LensExtensionId) {
-    logger.info(`${logModule} deleting extension instance ${lensExtensionId}`);
+    this.dependencies.logger.info(`${logModule} deleting extension instance ${lensExtensionId}`);
     const instance = this.dependencies.extensionInstances.get(lensExtensionId);
 
     if (!instance) {
@@ -177,7 +181,7 @@ export class ExtensionLoader {
       this.dependencies.extensionInstances.delete(lensExtensionId);
       this.nonInstancesByName.delete(instance.name);
     } catch (error) {
-      logger.error(`${logModule}: deactivation extension error`, { lensExtensionId, error });
+      this.dependencies.logger.error(`${logModule}: deactivation extension error`, { lensExtensionId, error });
     }
   }
 
@@ -252,7 +256,7 @@ export class ExtensionLoader {
   }
 
   loadOnClusterManagerRenderer = () => {
-    logger.debug(`${logModule}: load on main renderer (cluster manager)`);
+    this.dependencies.logger.debug(`${logModule}: load on main renderer (cluster manager)`);
 
     return this.autoInitExtensions(async (ext) => {
       const extension = ext as LensRendererExtension;
@@ -274,7 +278,7 @@ export class ExtensionLoader {
   };
 
   loadOnClusterRenderer = () => {
-    logger.debug(`${logModule}: load on cluster renderer (dashboard)`);
+    this.dependencies.logger.debug(`${logModule}: load on cluster renderer (dashboard)`);
 
     this.autoInitExtensions(async () => []);
   };
@@ -313,7 +317,7 @@ export class ExtensionLoader {
               activated: instance.activate(),
             };
           } catch (err) {
-            logger.error(`${logModule}: error loading extension`, { ext: extension, err });
+            this.dependencies.logger.error(`${logModule}: error loading extension`, { ext: extension, err });
           }
         } else if (!extension.isEnabled && alreadyInit) {
           this.removeInstance(extId);
@@ -330,7 +334,7 @@ export class ExtensionLoader {
       extensions.map(extension =>
         // If extension activation fails, log error
         extension.activated.catch((error) => {
-          logger.error(`${logModule}: activation extension error`, { ext: extension.installedExtension, error });
+          this.dependencies.logger.error(`${logModule}: activation extension error`, { ext: extension.installedExtension, error });
         }),
       ),
     );
@@ -344,7 +348,7 @@ export class ExtensionLoader {
     // Return ExtensionLoading[]
     return extensions.map(extension => {
       const loaded = extension.instance.enable(register).catch((err) => {
-        logger.error(`${logModule}: failed to enable`, { ext: extension, err });
+        this.dependencies.logger.error(`${logModule}: failed to enable`, { ext: extension, err });
       });
 
       return {
@@ -370,14 +374,14 @@ export class ExtensionLoader {
       return null;
     }
 
-    const extAbsolutePath = path.resolve(path.join(path.dirname(extension.manifestPath), extRelativePath));
+    const extAbsolutePath = this.dependencies.joinPaths(this.dependencies.getDirnameOfPath(extension.manifestPath), extRelativePath);
 
     try {
       return __non_webpack_require__(extAbsolutePath).default;
     } catch (error) {
       const message = (error instanceof Error ? error.stack : undefined) || error;
 
-      logger.error(`${logModule}: can't load ${entryPointName} for "${extension.manifest.name}": ${message}`, { extension });
+      this.dependencies.logger.error(`${logModule}: can't load ${entryPointName} for "${extension.manifest.name}": ${message}`, { extension });
     }
 
     return null;
diff --git a/src/extensions/extension-loader/extension-registrator-injection-token.ts b/src/extensions/extension-loader/extension-registrator-injection-token.ts
index b5527cd00d..295d3b67a4 100644
--- a/src/extensions/extension-loader/extension-registrator-injection-token.ts
+++ b/src/extensions/extension-loader/extension-registrator-injection-token.ts
@@ -4,10 +4,12 @@
  */
 import type { Injectable } from "@ogre-tools/injectable";
 import { getInjectionToken } from "@ogre-tools/injectable";
+import type { IComputedValue } from "mobx";
 import type { LensExtension } from "../lens-extension";
 
-export const extensionRegistratorInjectionToken = getInjectionToken<
-  (extension: LensExtension) => Injectable<any, any, any>[]
-    >({
-      id: "extension-registrator-token",
-    });
+export type ExtensionRegistrator = (extension: LensExtension) =>
+  Injectable<any, any, any>[] | IComputedValue<Injectable<any, any, any>[]>;
+
+export const extensionRegistratorInjectionToken = getInjectionToken<ExtensionRegistrator>({
+  id: "extension-registrator-token",
+});
diff --git a/src/extensions/extension-loader/extension/extension.injectable.ts b/src/extensions/extension-loader/extension/extension.injectable.ts
index 7ed23a3dfa..6b9424cea4 100644
--- a/src/extensions/extension-loader/extension/extension.injectable.ts
+++ b/src/extensions/extension-loader/extension/extension.injectable.ts
@@ -2,8 +2,11 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
+import type { Injectable } from "@ogre-tools/injectable";
 import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
-import { runInAction } from "mobx";
+import { difference, find, map } from "lodash";
+import { reaction, runInAction } from "mobx";
+import { disposer } from "../../../common/utils/disposer";
 import type { LensExtension } from "../../lens-extension";
 import { extensionRegistratorInjectionToken } from "../extension-registrator-injection-token";
 
@@ -12,6 +15,16 @@ export interface Extension {
   deregister: () => void;
 }
 
+const idsToInjectables = (ids: string[], injectables: Injectable<any, any, any>[]) => ids.map(id => {
+  const injectable = find(injectables, { id });
+
+  if (!injectable) {
+    throw new Error(`Injectable ${id} not found`);
+  }
+
+  return injectable;
+});
+
 const extensionInjectable = getInjectable({
   id: "extension",
 
@@ -21,19 +34,42 @@ const extensionInjectable = getInjectable({
 
       instantiate: (childDi) => {
         const extensionRegistrators = childDi.injectMany(extensionRegistratorInjectionToken);
+        const reactionDisposer = disposer();
 
         return {
           register: () => {
-            const injectables = extensionRegistrators.flatMap((getInjectablesOfExtension) =>
-              getInjectablesOfExtension(instance),
-            );
+            extensionRegistrators.forEach((getInjectablesOfExtension) => {
+              const injectables = getInjectablesOfExtension(instance);
 
-            runInAction(() => {
-              childDi.register(...injectables);
+              reactionDisposer.push(
+                // injectables is either an array or a computed array, in which case
+                // we need to update the registered injectables with a reaction every time they change 
+                reaction(
+                  () => Array.isArray(injectables) ? injectables : injectables.get(),
+                  (currentInjectables, previousInjectables = []) => {
+                    // Register new injectables and deregister removed injectables by id
+                    const currentIds = map(currentInjectables, "id");
+                    const previousIds = map(previousInjectables, "id");
+                    const idsToAdd = difference(currentIds, previousIds);
+                    const idsToRemove = previousIds.filter(previousId => !currentIds.includes(previousId));
+
+                    if (idsToRemove.length > 0) {
+                      childDi.deregister(...idsToInjectables(idsToRemove, previousInjectables));
+                    }
+
+                    if (idsToAdd.length > 0) {
+                      childDi.register(...idsToInjectables(idsToAdd, currentInjectables));
+                    }
+                  }, {
+                    fireImmediately: true,
+                  },
+                ));
             });
           },
 
           deregister: () => {
+            reactionDisposer();
+
             runInAction(() => {
               parentDi.deregister(extensionInjectable);
             });
diff --git a/src/extensions/extension-loader/file-system-provisioner-store/directory-for-extension-data.injectable.ts b/src/extensions/extension-loader/file-system-provisioner-store/directory-for-extension-data.injectable.ts
index 896c74da6d..469ed85949 100644
--- a/src/extensions/extension-loader/file-system-provisioner-store/directory-for-extension-data.injectable.ts
+++ b/src/extensions/extension-loader/file-system-provisioner-store/directory-for-extension-data.injectable.ts
@@ -4,16 +4,16 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
-import getAbsolutePathInjectable from "../../../common/path/get-absolute-path.injectable";
+import joinPathsInjectable from "../../../common/path/join-paths.injectable";
 
 const directoryForExtensionDataInjectable = getInjectable({
   id: "directory-for-extension-data",
 
   instantiate: (di) => {
-    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
     const directoryForUserData = di.inject(directoryForUserDataInjectable);
 
-    return getAbsolutePath(directoryForUserData, "extension_data");
+    return joinPaths(directoryForUserData, "extension_data");
   },
 });
 
diff --git a/src/extensions/lens-main-extension.ts b/src/extensions/lens-main-extension.ts
index accc87989c..b97d8da834 100644
--- a/src/extensions/lens-main-extension.ts
+++ b/src/extensions/lens-main-extension.ts
@@ -5,15 +5,15 @@
 
 import { LensExtension, lensExtensionDependencies } from "./lens-extension";
 import type { CatalogEntity } from "../common/catalog";
-import type { IObservableArray } from "mobx";
-import type { MenuRegistration } from "../main/menu/menu-registration";
+import type { IComputedValue, IObservableArray } from "mobx";
+import type { MenuRegistration } from "../features/application-menu/main/menu-registration";
 import type { TrayMenuRegistration } from "../main/tray/tray-menu-registration";
 import type { ShellEnvModifier } from "../main/shell-session/shell-env-modifier/shell-env-modifier-registration";
 import type { LensMainExtensionDependencies } from "./lens-extension-set-dependencies";
 
 export class LensMainExtension extends LensExtension<LensMainExtensionDependencies> {
   appMenus: MenuRegistration[] = [];
-  trayMenus: TrayMenuRegistration[] = [];
+  trayMenus: TrayMenuRegistration[] | IComputedValue<TrayMenuRegistration[]> = [];
 
   /**
    * implement this to modify the shell environment that Lens terminals are opened with. The ShellEnvModifier type has the signature
diff --git a/src/extensions/lens-renderer-extension.ts b/src/extensions/lens-renderer-extension.ts
index d744d261d4..d0a2a979e6 100644
--- a/src/extensions/lens-renderer-extension.ts
+++ b/src/extensions/lens-renderer-extension.ts
@@ -14,7 +14,7 @@ import type { KubernetesCluster } from "../common/catalog-entities";
 import type { WelcomeMenuRegistration } from "../renderer/components/+welcome/welcome-menu-items/welcome-menu-registration";
 import type { WelcomeBannerRegistration } from "../renderer/components/+welcome/welcome-banner-items/welcome-banner-registration";
 import type { CommandRegistration } from "../renderer/components/command-palette/registered-commands/commands";
-import type { AppPreferenceRegistration } from "../renderer/components/+preferences/app-preferences/app-preference-registration";
+import type { AppPreferenceRegistration } from "../features/preferences/renderer/compliance-for-legacy-extension-api/app-preference-registration";
 import type { AdditionalCategoryColumnRegistration } from "../renderer/components/+catalog/custom-category-columns";
 import type { CustomCategoryViewRegistration } from "../renderer/components/+catalog/custom-views";
 import type { StatusBarRegistration } from "../renderer/components/status-bar/status-bar-registration";
@@ -26,13 +26,15 @@ import { pipeline } from "@ogre-tools/fp";
 import { getExtensionRoutePath } from "../renderer/routes/for-extension";
 import type { LensRendererExtensionDependencies } from "./lens-extension-set-dependencies";
 import type { KubeObjectHandlerRegistration } from "../renderer/kube-object/handler";
-import type { AppPreferenceTabRegistration } from "../renderer/components/+preferences/app-preference-tab/app-preference-tab-registration";
+import type { AppPreferenceTabRegistration } from "../features/preferences/renderer/compliance-for-legacy-extension-api/app-preference-tab-registration";
 import type { KubeObjectDetailRegistration } from "../renderer/components/kube-object-details/kube-object-detail-registration";
+import type { ClusterFrameChildComponent } from "../renderer/frames/cluster-frame/cluster-frame-child-component-injection-token";
 
 export class LensRendererExtension extends LensExtension<LensRendererExtensionDependencies> {
   globalPages: registries.PageRegistration[] = [];
   clusterPages: registries.PageRegistration[] = [];
   clusterPageMenus: registries.ClusterPageMenuRegistration[] = [];
+  clusterFrameComponents: ClusterFrameChildComponent[] = [];
   kubeObjectStatusTexts: KubeObjectStatusRegistration[] = [];
   appPreferences: AppPreferenceRegistration[] = [];
   appPreferenceTabs: AppPreferenceTabRegistration[] = [];
diff --git a/src/extensions/npm/extensions/package-lock.json b/src/extensions/npm/extensions/package-lock.json
deleted file mode 100644
index dd8bade7d9..0000000000
--- a/src/extensions/npm/extensions/package-lock.json
+++ /dev/null
@@ -1,2288 +0,0 @@
-{
-  "name": "@k8slens/extensions",
-  "version": "0.0.1",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@k8slens/extensions",
-      "version": "0.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "@material-ui/core": "4.12.3",
-        "@types/node": "14.17.14",
-        "@types/react": "^17.0.45",
-        "@types/react-dom": "^17.0.16",
-        "@types/react-router": "^5.1.18",
-        "@types/react-router-dom": "^5.3.3",
-        "conf": "^7.0.1",
-        "mobx": "^6.5.0",
-        "mobx-react": "^7.3.0",
-        "react-select": "^5.3.2",
-        "typed-emitter": "^1.3.1"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-      "dependencies": {
-        "@babel/highlight": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz",
-      "integrity": "sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
-      "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz",
-      "integrity": "sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
-      "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz",
-      "integrity": "sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@emotion/babel-plugin": {
-      "version": "11.9.2",
-      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.9.2.tgz",
-      "integrity": "sha512-Pr/7HGH6H6yKgnVFNEj2MVlreu3ADqftqjqwUvDy/OJzKFgxKeTQ+eeUf20FOTuHVkDON2iNa25rAXVYtWJCjw==",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/plugin-syntax-jsx": "^7.12.13",
-        "@babel/runtime": "^7.13.10",
-        "@emotion/hash": "^0.8.0",
-        "@emotion/memoize": "^0.7.5",
-        "@emotion/serialize": "^1.0.2",
-        "babel-plugin-macros": "^2.6.1",
-        "convert-source-map": "^1.5.0",
-        "escape-string-regexp": "^4.0.0",
-        "find-root": "^1.1.0",
-        "source-map": "^0.5.7",
-        "stylis": "4.0.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@emotion/cache": {
-      "version": "11.9.3",
-      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.9.3.tgz",
-      "integrity": "sha512-0dgkI/JKlCXa+lEXviaMtGBL0ynpx4osh7rjOXE71q9bIF8G+XhJgvi+wDu0B0IdCVx37BffiwXlN9I3UuzFvg==",
-      "dependencies": {
-        "@emotion/memoize": "^0.7.4",
-        "@emotion/sheet": "^1.1.1",
-        "@emotion/utils": "^1.0.0",
-        "@emotion/weak-memoize": "^0.2.5",
-        "stylis": "4.0.13"
-      }
-    },
-    "node_modules/@emotion/hash": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
-      "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
-    },
-    "node_modules/@emotion/memoize": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz",
-      "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="
-    },
-    "node_modules/@emotion/react": {
-      "version": "11.9.3",
-      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.9.3.tgz",
-      "integrity": "sha512-g9Q1GcTOlzOEjqwuLF/Zd9LC+4FljjPjDfxSM7KmEakm+hsHXk+bYZ2q+/hTJzr0OUNkujo72pXLQvXj6H+GJQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.13.10",
-        "@emotion/babel-plugin": "^11.7.1",
-        "@emotion/cache": "^11.9.3",
-        "@emotion/serialize": "^1.0.4",
-        "@emotion/utils": "^1.1.0",
-        "@emotion/weak-memoize": "^0.2.5",
-        "hoist-non-react-statics": "^3.3.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "react": ">=16.8.0"
-      },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        },
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@emotion/serialize": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.4.tgz",
-      "integrity": "sha512-1JHamSpH8PIfFwAMryO2bNka+y8+KA5yga5Ocf2d7ZEiJjb7xlLW7aknBGZqJLajuLOvJ+72vN+IBSwPlXD1Pg==",
-      "dependencies": {
-        "@emotion/hash": "^0.8.0",
-        "@emotion/memoize": "^0.7.4",
-        "@emotion/unitless": "^0.7.5",
-        "@emotion/utils": "^1.0.0",
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/@emotion/serialize/node_modules/csstype": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz",
-      "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="
-    },
-    "node_modules/@emotion/sheet": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.1.1.tgz",
-      "integrity": "sha512-J3YPccVRMiTZxYAY0IOq3kd+hUP8idY8Kz6B/Cyo+JuXq52Ek+zbPbSQUrVQp95aJ+lsAW7DPL1P2Z+U1jGkKA=="
-    },
-    "node_modules/@emotion/unitless": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
-      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
-    },
-    "node_modules/@emotion/utils": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.1.0.tgz",
-      "integrity": "sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ=="
-    },
-    "node_modules/@emotion/weak-memoize": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",
-      "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="
-    },
-    "node_modules/@material-ui/core": {
-      "version": "4.12.3",
-      "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.12.3.tgz",
-      "integrity": "sha512-sdpgI/PL56QVsEJldwEe4FFaFTLUqN+rd7sSZiRCdx2E/C7z5yK0y/khAWVBH24tXwto7I1hCzNWfJGZIYJKnw==",
-      "deprecated": "You can now upgrade to @mui/material. See the guide: https://mui.com/guides/migration-v4/",
-      "dependencies": {
-        "@babel/runtime": "^7.4.4",
-        "@material-ui/styles": "^4.11.4",
-        "@material-ui/system": "^4.12.1",
-        "@material-ui/types": "5.1.0",
-        "@material-ui/utils": "^4.11.2",
-        "@types/react-transition-group": "^4.2.0",
-        "clsx": "^1.0.4",
-        "hoist-non-react-statics": "^3.3.2",
-        "popper.js": "1.16.1-lts",
-        "prop-types": "^15.7.2",
-        "react-is": "^16.8.0 || ^17.0.0",
-        "react-transition-group": "^4.4.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/material-ui"
-      },
-      "peerDependencies": {
-        "@types/react": "^16.8.6 || ^17.0.0",
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@material-ui/styles": {
-      "version": "4.11.5",
-      "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.5.tgz",
-      "integrity": "sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA==",
-      "dependencies": {
-        "@babel/runtime": "^7.4.4",
-        "@emotion/hash": "^0.8.0",
-        "@material-ui/types": "5.1.0",
-        "@material-ui/utils": "^4.11.3",
-        "clsx": "^1.0.4",
-        "csstype": "^2.5.2",
-        "hoist-non-react-statics": "^3.3.2",
-        "jss": "^10.5.1",
-        "jss-plugin-camel-case": "^10.5.1",
-        "jss-plugin-default-unit": "^10.5.1",
-        "jss-plugin-global": "^10.5.1",
-        "jss-plugin-nested": "^10.5.1",
-        "jss-plugin-props-sort": "^10.5.1",
-        "jss-plugin-rule-value-function": "^10.5.1",
-        "jss-plugin-vendor-prefixer": "^10.5.1",
-        "prop-types": "^15.7.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/material-ui"
-      },
-      "peerDependencies": {
-        "@types/react": "^16.8.6 || ^17.0.0",
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@material-ui/system": {
-      "version": "4.12.2",
-      "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.12.2.tgz",
-      "integrity": "sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw==",
-      "dependencies": {
-        "@babel/runtime": "^7.4.4",
-        "@material-ui/utils": "^4.11.3",
-        "csstype": "^2.5.2",
-        "prop-types": "^15.7.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/material-ui"
-      },
-      "peerDependencies": {
-        "@types/react": "^16.8.6 || ^17.0.0",
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@material-ui/types": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz",
-      "integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==",
-      "peerDependencies": {
-        "@types/react": "*"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@material-ui/utils": {
-      "version": "4.11.3",
-      "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.3.tgz",
-      "integrity": "sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg==",
-      "dependencies": {
-        "@babel/runtime": "^7.4.4",
-        "prop-types": "^15.7.2",
-        "react-is": "^16.8.0 || ^17.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0"
-      }
-    },
-    "node_modules/@types/history": {
-      "version": "4.7.11",
-      "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
-      "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA=="
-    },
-    "node_modules/@types/node": {
-      "version": "14.17.14",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.14.tgz",
-      "integrity": "sha512-rsAj2u8Xkqfc332iXV12SqIsjVi07H479bOP4q94NAcjzmAvapumEhuVIt53koEf7JFrpjgNKjBga5Pnn/GL8A=="
-    },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
-    },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.5",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
-    },
-    "node_modules/@types/react": {
-      "version": "17.0.45",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.45.tgz",
-      "integrity": "sha512-YfhQ22Lah2e3CHPsb93tRwIGNiSwkuz1/blk4e6QrWS0jQzCSNbGLtOEYhPg02W0yGTTmpajp7dCTbBAMN3qsg==",
-      "dependencies": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/@types/react-dom": {
-      "version": "17.0.16",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.16.tgz",
-      "integrity": "sha512-DWcXf8EbMrO/gWnQU7Z88Ws/p16qxGpPyjTKTpmBSFKeE+HveVubqGO1CVK7FrwlWD5MuOcvh8gtd0/XO38NdQ==",
-      "dependencies": {
-        "@types/react": "^17"
-      }
-    },
-    "node_modules/@types/react-router": {
-      "version": "5.1.18",
-      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.18.tgz",
-      "integrity": "sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==",
-      "dependencies": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*"
-      }
-    },
-    "node_modules/@types/react-router-dom": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
-      "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
-      "dependencies": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*",
-        "@types/react-router": "*"
-      }
-    },
-    "node_modules/@types/react-transition-group": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz",
-      "integrity": "sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==",
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
-    "node_modules/@types/react/node_modules/csstype": {
-      "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz",
-      "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="
-    },
-    "node_modules/@types/scheduler": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/atomically": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz",
-      "integrity": "sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==",
-      "engines": {
-        "node": ">=10.12.0"
-      }
-    },
-    "node_modules/babel-plugin-macros": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
-      "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
-      "dependencies": {
-        "@babel/runtime": "^7.7.2",
-        "cosmiconfig": "^6.0.0",
-        "resolve": "^1.12.0"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chalk/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/clsx": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
-      "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-    },
-    "node_modules/conf": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/conf/-/conf-7.1.2.tgz",
-      "integrity": "sha512-r8/HEoWPFn4CztjhMJaWNAe5n+gPUCSaJ0oufbqDLFKsA1V8JjAG7G+p0pgoDFAws9Bpk2VtVLLXqOBA7WxLeg==",
-      "dependencies": {
-        "ajv": "^6.12.2",
-        "atomically": "^1.3.1",
-        "debounce-fn": "^4.0.0",
-        "dot-prop": "^5.2.0",
-        "env-paths": "^2.2.0",
-        "json-schema-typed": "^7.0.3",
-        "make-dir": "^3.1.0",
-        "onetime": "^5.1.0",
-        "pkg-up": "^3.1.0",
-        "semver": "^7.3.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "node_modules/cosmiconfig": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.1.0",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.7.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/css-vendor": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz",
-      "integrity": "sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.8.3",
-        "is-in-browser": "^1.0.2"
-      }
-    },
-    "node_modules/csstype": {
-      "version": "2.6.20",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz",
-      "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA=="
-    },
-    "node_modules/debounce-fn": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz",
-      "integrity": "sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ==",
-      "dependencies": {
-        "mimic-fn": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/dom-helpers": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
-      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
-      "dependencies": {
-        "@babel/runtime": "^7.8.7",
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/dom-helpers/node_modules/csstype": {
-      "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz",
-      "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="
-    },
-    "node_modules/dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dependencies": {
-        "is-obj": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "node_modules/find-root": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
-    },
-    "node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hoist-non-react-statics": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-      "dependencies": {
-        "react-is": "^16.7.0"
-      }
-    },
-    "node_modules/hoist-non-react-statics/node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "node_modules/hyphenate-style-name": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz",
-      "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ=="
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-    },
-    "node_modules/is-core-module": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-in-browser": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz",
-      "integrity": "sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU="
-    },
-    "node_modules/is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "node_modules/json-schema-typed": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.3.tgz",
-      "integrity": "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A=="
-    },
-    "node_modules/jss": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss/-/jss-10.9.0.tgz",
-      "integrity": "sha512-YpzpreB6kUunQBbrlArlsMpXYyndt9JATbt95tajx0t4MTJJcCJdd4hdNpHmOIDiUJrF/oX5wtVFrS3uofWfGw==",
-      "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "csstype": "^3.0.2",
-        "is-in-browser": "^1.1.3",
-        "tiny-warning": "^1.0.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/jss"
-      }
-    },
-    "node_modules/jss-plugin-camel-case": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.0.tgz",
-      "integrity": "sha512-UH6uPpnDk413/r/2Olmw4+y54yEF2lRIV8XIZyuYpgPYTITLlPOsq6XB9qeqv+75SQSg3KLocq5jUBXW8qWWww==",
-      "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "hyphenate-style-name": "^1.0.3",
-        "jss": "10.9.0"
-      }
-    },
-    "node_modules/jss-plugin-default-unit": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.9.0.tgz",
-      "integrity": "sha512-7Ju4Q9wJ/MZPsxfu4T84mzdn7pLHWeqoGd/D8O3eDNNJ93Xc8PxnLmV8s8ZPNRYkLdxZqKtm1nPQ0BM4JRlq2w==",
-      "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.9.0"
-      }
-    },
-    "node_modules/jss-plugin-global": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.9.0.tgz",
-      "integrity": "sha512-4G8PHNJ0x6nwAFsEzcuVDiBlyMsj2y3VjmFAx/uHk/R/gzJV+yRHICjT4MKGGu1cJq2hfowFWCyrr/Gg37FbgQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.9.0"
-      }
-    },
-    "node_modules/jss-plugin-nested": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.9.0.tgz",
-      "integrity": "sha512-2UJnDrfCZpMYcpPYR16oZB7VAC6b/1QLsRiAutOt7wJaaqwCBvNsosLEu/fUyKNQNGdvg2PPJFDO5AX7dwxtoA==",
-      "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.9.0",
-        "tiny-warning": "^1.0.2"
-      }
-    },
-    "node_modules/jss-plugin-props-sort": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.9.0.tgz",
-      "integrity": "sha512-7A76HI8bzwqrsMOJTWKx/uD5v+U8piLnp5bvru7g/3ZEQOu1+PjHvv7bFdNO3DwNPC9oM0a//KwIJsIcDCjDzw==",
-      "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.9.0"
-      }
-    },
-    "node_modules/jss-plugin-rule-value-function": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.9.0.tgz",
-      "integrity": "sha512-IHJv6YrEf8pRzkY207cPmdbBstBaE+z8pazhPShfz0tZSDtRdQua5jjg6NMz3IbTasVx9FdnmptxPqSWL5tyJg==",
-      "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.9.0",
-        "tiny-warning": "^1.0.2"
-      }
-    },
-    "node_modules/jss-plugin-vendor-prefixer": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.9.0.tgz",
-      "integrity": "sha512-MbvsaXP7iiVdYVSEoi+blrW+AYnTDvHTW6I6zqi7JcwXdc6I9Kbm234nEblayhF38EftoenbM+5218pidmC5gA==",
-      "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "css-vendor": "^2.0.8",
-        "jss": "10.9.0"
-      }
-    },
-    "node_modules/jss/node_modules/csstype": {
-      "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz",
-      "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
-    },
-    "node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/memoize-one": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
-      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
-    },
-    "node_modules/mimic-fn": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
-      "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/mobx": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/mobx/-/mobx-6.5.0.tgz",
-      "integrity": "sha512-pHZ/cySF00FVENDWIDzJyoObFahK6Eg4d0papqm6d7yMkxWTZ/S/csqJX1A3PsYy4t5k3z2QnlwuCfMW5lSEwA==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mobx"
-      }
-    },
-    "node_modules/mobx-react": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-7.4.0.tgz",
-      "integrity": "sha512-gbUwaKZK09SiAleTMxNMKs1MYKTpoIEWJLTLRIR/xnALuuHET8wkL8j1nbc1/6cDkOWVyKz/ReftILx0Pdh2PQ==",
-      "dependencies": {
-        "mobx-react-lite": "^3.4.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mobx"
-      },
-      "peerDependencies": {
-        "mobx": "^6.1.0",
-        "react": "^16.8.0 || ^17 || ^18"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/mobx-react-lite": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.4.0.tgz",
-      "integrity": "sha512-bRuZp3C0itgLKHu/VNxi66DN/XVkQG7xtoBVWxpvC5FhAqbOCP21+nPhULjnzEqd7xBMybp6KwytdUpZKEgpIQ==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mobx"
-      },
-      "peerDependencies": {
-        "mobx": "^6.1.0",
-        "react": "^16.8.0 || ^17 || ^18"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/onetime/node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-up": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
-      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/popper.js": {
-      "version": "1.16.1-lts",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz",
-      "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA=="
-    },
-    "node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/prop-types/node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-    },
-    "node_modules/react-select": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.3.2.tgz",
-      "integrity": "sha512-W6Irh7U6Ha7p5uQQ2ZnemoCQ8mcfgOtHfw3wuMzG6FAu0P+CYicgofSLOq97BhjMx8jS+h+wwWdCBeVVZ9VqlQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.12.0",
-        "@emotion/cache": "^11.4.0",
-        "@emotion/react": "^11.8.1",
-        "@types/react-transition-group": "^4.4.0",
-        "memoize-one": "^5.0.0",
-        "prop-types": "^15.6.0",
-        "react-transition-group": "^4.3.0"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
-    "node_modules/react-transition-group": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
-      "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
-      "dependencies": {
-        "@babel/runtime": "^7.5.5",
-        "dom-helpers": "^5.0.1",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.6.2"
-      },
-      "peerDependencies": {
-        "react": ">=16.6.0",
-        "react-dom": ">=16.6.0"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
-    },
-    "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/stylis": {
-      "version": "4.0.13",
-      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz",
-      "integrity": "sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag=="
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/tiny-warning": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
-      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/typed-emitter": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/typed-emitter/-/typed-emitter-1.4.0.tgz",
-      "integrity": "sha512-weBmoo3HhpKGgLBOYwe8EB31CzDFuaK7CCL+axXhUYhn4jo6DSkHnbefboCF5i4DQ2aMFe0C/FdTWcPdObgHyg=="
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "engines": {
-        "node": ">= 6"
-      }
-    }
-  },
-  "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-      "requires": {
-        "@babel/highlight": "^7.16.7"
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-      "requires": {
-        "@babel/types": "^7.16.7"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz",
-      "integrity": "sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA=="
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="
-    },
-    "@babel/highlight": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
-      "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "@babel/plugin-syntax-jsx": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz",
-      "integrity": "sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/runtime": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
-      "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
-      "requires": {
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "@babel/types": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz",
-      "integrity": "sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@emotion/babel-plugin": {
-      "version": "11.9.2",
-      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.9.2.tgz",
-      "integrity": "sha512-Pr/7HGH6H6yKgnVFNEj2MVlreu3ADqftqjqwUvDy/OJzKFgxKeTQ+eeUf20FOTuHVkDON2iNa25rAXVYtWJCjw==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/plugin-syntax-jsx": "^7.12.13",
-        "@babel/runtime": "^7.13.10",
-        "@emotion/hash": "^0.8.0",
-        "@emotion/memoize": "^0.7.5",
-        "@emotion/serialize": "^1.0.2",
-        "babel-plugin-macros": "^2.6.1",
-        "convert-source-map": "^1.5.0",
-        "escape-string-regexp": "^4.0.0",
-        "find-root": "^1.1.0",
-        "source-map": "^0.5.7",
-        "stylis": "4.0.13"
-      }
-    },
-    "@emotion/cache": {
-      "version": "11.9.3",
-      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.9.3.tgz",
-      "integrity": "sha512-0dgkI/JKlCXa+lEXviaMtGBL0ynpx4osh7rjOXE71q9bIF8G+XhJgvi+wDu0B0IdCVx37BffiwXlN9I3UuzFvg==",
-      "requires": {
-        "@emotion/memoize": "^0.7.4",
-        "@emotion/sheet": "^1.1.1",
-        "@emotion/utils": "^1.0.0",
-        "@emotion/weak-memoize": "^0.2.5",
-        "stylis": "4.0.13"
-      }
-    },
-    "@emotion/hash": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
-      "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
-    },
-    "@emotion/memoize": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz",
-      "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="
-    },
-    "@emotion/react": {
-      "version": "11.9.3",
-      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.9.3.tgz",
-      "integrity": "sha512-g9Q1GcTOlzOEjqwuLF/Zd9LC+4FljjPjDfxSM7KmEakm+hsHXk+bYZ2q+/hTJzr0OUNkujo72pXLQvXj6H+GJQ==",
-      "requires": {
-        "@babel/runtime": "^7.13.10",
-        "@emotion/babel-plugin": "^11.7.1",
-        "@emotion/cache": "^11.9.3",
-        "@emotion/serialize": "^1.0.4",
-        "@emotion/utils": "^1.1.0",
-        "@emotion/weak-memoize": "^0.2.5",
-        "hoist-non-react-statics": "^3.3.1"
-      }
-    },
-    "@emotion/serialize": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.4.tgz",
-      "integrity": "sha512-1JHamSpH8PIfFwAMryO2bNka+y8+KA5yga5Ocf2d7ZEiJjb7xlLW7aknBGZqJLajuLOvJ+72vN+IBSwPlXD1Pg==",
-      "requires": {
-        "@emotion/hash": "^0.8.0",
-        "@emotion/memoize": "^0.7.4",
-        "@emotion/unitless": "^0.7.5",
-        "@emotion/utils": "^1.0.0",
-        "csstype": "^3.0.2"
-      },
-      "dependencies": {
-        "csstype": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz",
-          "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="
-        }
-      }
-    },
-    "@emotion/sheet": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.1.1.tgz",
-      "integrity": "sha512-J3YPccVRMiTZxYAY0IOq3kd+hUP8idY8Kz6B/Cyo+JuXq52Ek+zbPbSQUrVQp95aJ+lsAW7DPL1P2Z+U1jGkKA=="
-    },
-    "@emotion/unitless": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
-      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
-    },
-    "@emotion/utils": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.1.0.tgz",
-      "integrity": "sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ=="
-    },
-    "@emotion/weak-memoize": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",
-      "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="
-    },
-    "@material-ui/core": {
-      "version": "4.12.3",
-      "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.12.3.tgz",
-      "integrity": "sha512-sdpgI/PL56QVsEJldwEe4FFaFTLUqN+rd7sSZiRCdx2E/C7z5yK0y/khAWVBH24tXwto7I1hCzNWfJGZIYJKnw==",
-      "requires": {
-        "@babel/runtime": "^7.4.4",
-        "@material-ui/styles": "^4.11.4",
-        "@material-ui/system": "^4.12.1",
-        "@material-ui/types": "5.1.0",
-        "@material-ui/utils": "^4.11.2",
-        "@types/react-transition-group": "^4.2.0",
-        "clsx": "^1.0.4",
-        "hoist-non-react-statics": "^3.3.2",
-        "popper.js": "1.16.1-lts",
-        "prop-types": "^15.7.2",
-        "react-is": "^16.8.0 || ^17.0.0",
-        "react-transition-group": "^4.4.0"
-      }
-    },
-    "@material-ui/styles": {
-      "version": "4.11.5",
-      "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.5.tgz",
-      "integrity": "sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA==",
-      "requires": {
-        "@babel/runtime": "^7.4.4",
-        "@emotion/hash": "^0.8.0",
-        "@material-ui/types": "5.1.0",
-        "@material-ui/utils": "^4.11.3",
-        "clsx": "^1.0.4",
-        "csstype": "^2.5.2",
-        "hoist-non-react-statics": "^3.3.2",
-        "jss": "^10.5.1",
-        "jss-plugin-camel-case": "^10.5.1",
-        "jss-plugin-default-unit": "^10.5.1",
-        "jss-plugin-global": "^10.5.1",
-        "jss-plugin-nested": "^10.5.1",
-        "jss-plugin-props-sort": "^10.5.1",
-        "jss-plugin-rule-value-function": "^10.5.1",
-        "jss-plugin-vendor-prefixer": "^10.5.1",
-        "prop-types": "^15.7.2"
-      }
-    },
-    "@material-ui/system": {
-      "version": "4.12.2",
-      "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.12.2.tgz",
-      "integrity": "sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw==",
-      "requires": {
-        "@babel/runtime": "^7.4.4",
-        "@material-ui/utils": "^4.11.3",
-        "csstype": "^2.5.2",
-        "prop-types": "^15.7.2"
-      }
-    },
-    "@material-ui/types": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz",
-      "integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==",
-      "requires": {}
-    },
-    "@material-ui/utils": {
-      "version": "4.11.3",
-      "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.3.tgz",
-      "integrity": "sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg==",
-      "requires": {
-        "@babel/runtime": "^7.4.4",
-        "prop-types": "^15.7.2",
-        "react-is": "^16.8.0 || ^17.0.0"
-      }
-    },
-    "@types/history": {
-      "version": "4.7.11",
-      "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
-      "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA=="
-    },
-    "@types/node": {
-      "version": "14.17.14",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.14.tgz",
-      "integrity": "sha512-rsAj2u8Xkqfc332iXV12SqIsjVi07H479bOP4q94NAcjzmAvapumEhuVIt53koEf7JFrpjgNKjBga5Pnn/GL8A=="
-    },
-    "@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
-    },
-    "@types/prop-types": {
-      "version": "15.7.5",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
-    },
-    "@types/react": {
-      "version": "17.0.45",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.45.tgz",
-      "integrity": "sha512-YfhQ22Lah2e3CHPsb93tRwIGNiSwkuz1/blk4e6QrWS0jQzCSNbGLtOEYhPg02W0yGTTmpajp7dCTbBAMN3qsg==",
-      "requires": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
-      },
-      "dependencies": {
-        "csstype": {
-          "version": "3.0.11",
-          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz",
-          "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="
-        }
-      }
-    },
-    "@types/react-dom": {
-      "version": "17.0.16",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.16.tgz",
-      "integrity": "sha512-DWcXf8EbMrO/gWnQU7Z88Ws/p16qxGpPyjTKTpmBSFKeE+HveVubqGO1CVK7FrwlWD5MuOcvh8gtd0/XO38NdQ==",
-      "requires": {
-        "@types/react": "^17"
-      }
-    },
-    "@types/react-router": {
-      "version": "5.1.18",
-      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.18.tgz",
-      "integrity": "sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==",
-      "requires": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*"
-      }
-    },
-    "@types/react-router-dom": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
-      "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
-      "requires": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*",
-        "@types/react-router": "*"
-      }
-    },
-    "@types/react-transition-group": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz",
-      "integrity": "sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==",
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@types/scheduler": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
-    },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "atomically": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz",
-      "integrity": "sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w=="
-    },
-    "babel-plugin-macros": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
-      "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
-      "requires": {
-        "@babel/runtime": "^7.7.2",
-        "cosmiconfig": "^6.0.0",
-        "resolve": "^1.12.0"
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "dependencies": {
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
-        }
-      }
-    },
-    "clsx": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
-      "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA=="
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-    },
-    "conf": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/conf/-/conf-7.1.2.tgz",
-      "integrity": "sha512-r8/HEoWPFn4CztjhMJaWNAe5n+gPUCSaJ0oufbqDLFKsA1V8JjAG7G+p0pgoDFAws9Bpk2VtVLLXqOBA7WxLeg==",
-      "requires": {
-        "ajv": "^6.12.2",
-        "atomically": "^1.3.1",
-        "debounce-fn": "^4.0.0",
-        "dot-prop": "^5.2.0",
-        "env-paths": "^2.2.0",
-        "json-schema-typed": "^7.0.3",
-        "make-dir": "^3.1.0",
-        "onetime": "^5.1.0",
-        "pkg-up": "^3.1.0",
-        "semver": "^7.3.2"
-      }
-    },
-    "convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "cosmiconfig": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-      "requires": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.1.0",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.7.2"
-      }
-    },
-    "css-vendor": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz",
-      "integrity": "sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==",
-      "requires": {
-        "@babel/runtime": "^7.8.3",
-        "is-in-browser": "^1.0.2"
-      }
-    },
-    "csstype": {
-      "version": "2.6.20",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz",
-      "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA=="
-    },
-    "debounce-fn": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz",
-      "integrity": "sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ==",
-      "requires": {
-        "mimic-fn": "^3.0.0"
-      }
-    },
-    "dom-helpers": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
-      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
-      "requires": {
-        "@babel/runtime": "^7.8.7",
-        "csstype": "^3.0.2"
-      },
-      "dependencies": {
-        "csstype": {
-          "version": "3.0.11",
-          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz",
-          "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="
-        }
-      }
-    },
-    "dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "requires": {
-        "is-obj": "^2.0.0"
-      }
-    },
-    "env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "find-root": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
-    },
-    "find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "requires": {
-        "locate-path": "^3.0.0"
-      }
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
-    },
-    "hoist-non-react-statics": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-      "requires": {
-        "react-is": "^16.7.0"
-      },
-      "dependencies": {
-        "react-is": {
-          "version": "16.13.1",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-        }
-      }
-    },
-    "hyphenate-style-name": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz",
-      "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ=="
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-    },
-    "is-core-module": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-in-browser": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz",
-      "integrity": "sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU="
-    },
-    "is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "json-schema-typed": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.3.tgz",
-      "integrity": "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A=="
-    },
-    "jss": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss/-/jss-10.9.0.tgz",
-      "integrity": "sha512-YpzpreB6kUunQBbrlArlsMpXYyndt9JATbt95tajx0t4MTJJcCJdd4hdNpHmOIDiUJrF/oX5wtVFrS3uofWfGw==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "csstype": "^3.0.2",
-        "is-in-browser": "^1.1.3",
-        "tiny-warning": "^1.0.2"
-      },
-      "dependencies": {
-        "csstype": {
-          "version": "3.0.11",
-          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz",
-          "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="
-        }
-      }
-    },
-    "jss-plugin-camel-case": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.0.tgz",
-      "integrity": "sha512-UH6uPpnDk413/r/2Olmw4+y54yEF2lRIV8XIZyuYpgPYTITLlPOsq6XB9qeqv+75SQSg3KLocq5jUBXW8qWWww==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "hyphenate-style-name": "^1.0.3",
-        "jss": "10.9.0"
-      }
-    },
-    "jss-plugin-default-unit": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.9.0.tgz",
-      "integrity": "sha512-7Ju4Q9wJ/MZPsxfu4T84mzdn7pLHWeqoGd/D8O3eDNNJ93Xc8PxnLmV8s8ZPNRYkLdxZqKtm1nPQ0BM4JRlq2w==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.9.0"
-      }
-    },
-    "jss-plugin-global": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.9.0.tgz",
-      "integrity": "sha512-4G8PHNJ0x6nwAFsEzcuVDiBlyMsj2y3VjmFAx/uHk/R/gzJV+yRHICjT4MKGGu1cJq2hfowFWCyrr/Gg37FbgQ==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.9.0"
-      }
-    },
-    "jss-plugin-nested": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.9.0.tgz",
-      "integrity": "sha512-2UJnDrfCZpMYcpPYR16oZB7VAC6b/1QLsRiAutOt7wJaaqwCBvNsosLEu/fUyKNQNGdvg2PPJFDO5AX7dwxtoA==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.9.0",
-        "tiny-warning": "^1.0.2"
-      }
-    },
-    "jss-plugin-props-sort": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.9.0.tgz",
-      "integrity": "sha512-7A76HI8bzwqrsMOJTWKx/uD5v+U8piLnp5bvru7g/3ZEQOu1+PjHvv7bFdNO3DwNPC9oM0a//KwIJsIcDCjDzw==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.9.0"
-      }
-    },
-    "jss-plugin-rule-value-function": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.9.0.tgz",
-      "integrity": "sha512-IHJv6YrEf8pRzkY207cPmdbBstBaE+z8pazhPShfz0tZSDtRdQua5jjg6NMz3IbTasVx9FdnmptxPqSWL5tyJg==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.9.0",
-        "tiny-warning": "^1.0.2"
-      }
-    },
-    "jss-plugin-vendor-prefixer": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.9.0.tgz",
-      "integrity": "sha512-MbvsaXP7iiVdYVSEoi+blrW+AYnTDvHTW6I6zqi7JcwXdc6I9Kbm234nEblayhF38EftoenbM+5218pidmC5gA==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "css-vendor": "^2.0.8",
-        "jss": "10.9.0"
-      }
-    },
-    "lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
-    },
-    "locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "requires": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      }
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "requires": {
-        "semver": "^6.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        }
-      }
-    },
-    "memoize-one": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
-      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
-    },
-    "mimic-fn": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
-      "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ=="
-    },
-    "mobx": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/mobx/-/mobx-6.5.0.tgz",
-      "integrity": "sha512-pHZ/cySF00FVENDWIDzJyoObFahK6Eg4d0papqm6d7yMkxWTZ/S/csqJX1A3PsYy4t5k3z2QnlwuCfMW5lSEwA=="
-    },
-    "mobx-react": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-7.4.0.tgz",
-      "integrity": "sha512-gbUwaKZK09SiAleTMxNMKs1MYKTpoIEWJLTLRIR/xnALuuHET8wkL8j1nbc1/6cDkOWVyKz/ReftILx0Pdh2PQ==",
-      "requires": {
-        "mobx-react-lite": "^3.4.0"
-      }
-    },
-    "mobx-react-lite": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.4.0.tgz",
-      "integrity": "sha512-bRuZp3C0itgLKHu/VNxi66DN/XVkQG7xtoBVWxpvC5FhAqbOCP21+nPhULjnzEqd7xBMybp6KwytdUpZKEgpIQ==",
-      "requires": {}
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      },
-      "dependencies": {
-        "mimic-fn": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-        }
-      }
-    },
-    "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "requires": {
-        "p-limit": "^2.0.0"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      }
-    },
-    "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
-    },
-    "pkg-up": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
-      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
-      "requires": {
-        "find-up": "^3.0.0"
-      }
-    },
-    "popper.js": {
-      "version": "1.16.1-lts",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz",
-      "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA=="
-    },
-    "prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "requires": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      },
-      "dependencies": {
-        "react-is": {
-          "version": "16.13.1",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-        }
-      }
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-    },
-    "react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-    },
-    "react-select": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.3.2.tgz",
-      "integrity": "sha512-W6Irh7U6Ha7p5uQQ2ZnemoCQ8mcfgOtHfw3wuMzG6FAu0P+CYicgofSLOq97BhjMx8jS+h+wwWdCBeVVZ9VqlQ==",
-      "requires": {
-        "@babel/runtime": "^7.12.0",
-        "@emotion/cache": "^11.4.0",
-        "@emotion/react": "^11.8.1",
-        "@types/react-transition-group": "^4.4.0",
-        "memoize-one": "^5.0.0",
-        "prop-types": "^15.6.0",
-        "react-transition-group": "^4.3.0"
-      }
-    },
-    "react-transition-group": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
-      "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
-      "requires": {
-        "@babel/runtime": "^7.5.5",
-        "dom-helpers": "^5.0.1",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.6.2"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
-    },
-    "resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "requires": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      }
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "requires": {
-        "lru-cache": "^6.0.0"
-      }
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
-    },
-    "stylis": {
-      "version": "4.0.13",
-      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz",
-      "integrity": "sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag=="
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
-    },
-    "tiny-warning": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
-      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
-    },
-    "typed-emitter": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/typed-emitter/-/typed-emitter-1.4.0.tgz",
-      "integrity": "sha512-weBmoo3HhpKGgLBOYwe8EB31CzDFuaK7CCL+axXhUYhn4jo6DSkHnbefboCF5i4DQ2aMFe0C/FdTWcPdObgHyg=="
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
-    }
-  }
-}
diff --git a/src/extensions/npm/extensions/package.json b/src/extensions/npm/extensions/package.json
index 2afda96cf2..cd59286da0 100644
--- a/src/extensions/npm/extensions/package.json
+++ b/src/extensions/npm/extensions/package.json
@@ -2,7 +2,7 @@
   "name": "@k8slens/extensions",
   "productName": "OpenLens extensions",
   "description": "OpenLens - Open Source Kubernetes IDE: extensions",
-  "version": "0.0.1",
+  "version": "6.0.0",
   "copyright": "© 2022 OpenLens Authors",
   "license": "MIT",
   "main": "dist/src/extensions/extension-api.js",
@@ -16,8 +16,8 @@
     "name": "OpenLens Authors"
   },
   "dependencies": {
-    "@material-ui/core": "4.12.3",
-    "@types/node": "14.17.14",
+    "@material-ui/core": "^4.12.3",
+    "@types/node": "^16.11.58",
     "@types/react": "^17.0.45",
     "@types/react-dom": "^17.0.16",
     "@types/react-router": "^5.1.18",
diff --git a/src/features/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap b/src/features/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap
index 6fff5572d7..d755fa45fa 100644
--- a/src/features/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap
+++ b/src/features/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap
@@ -11,44 +11,61 @@ exports[`extension special characters in page registrations renders 1`] = `
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="home-button"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -77,7 +94,7 @@ exports[`extension special characters in page registrations renders 1`] = `
               style="width: 320px;"
             >
               <h2>
-                Welcome to OpenLens!
+                Welcome to some-product-name!
               </h2>
               <p>
                 To get you started we have auto-detected your clusters in your
@@ -183,6 +200,7 @@ exports[`extension special characters in page registrations renders 1`] = `
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -211,44 +229,62 @@ exports[`extension special characters in page registrations when navigating to r
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -303,6 +339,7 @@ exports[`extension special characters in page registrations when navigating to r
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/__snapshots__/navigate-to-extension-page.test.tsx.snap b/src/features/__snapshots__/navigate-to-extension-page.test.tsx.snap
index 9487506cf4..f65a451558 100644
--- a/src/features/__snapshots__/navigate-to-extension-page.test.tsx.snap
+++ b/src/features/__snapshots__/navigate-to-extension-page.test.tsx.snap
@@ -11,44 +11,61 @@ exports[`navigate to extension page renders 1`] = `
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="home-button"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -77,7 +94,7 @@ exports[`navigate to extension page renders 1`] = `
               style="width: 320px;"
             >
               <h2>
-                Welcome to OpenLens!
+                Welcome to some-product-name!
               </h2>
               <p>
                 To get you started we have auto-detected your clusters in your
@@ -183,6 +200,7 @@ exports[`navigate to extension page renders 1`] = `
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -211,44 +229,62 @@ exports[`navigate to extension page when extension navigates to child route rend
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -303,6 +339,7 @@ exports[`navigate to extension page when extension navigates to child route rend
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -331,44 +368,62 @@ exports[`navigate to extension page when extension navigates to route with param
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -439,6 +494,7 @@ exports[`navigate to extension page when extension navigates to route with param
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -467,44 +523,62 @@ exports[`navigate to extension page when extension navigates to route without pa
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -575,6 +649,7 @@ exports[`navigate to extension page when extension navigates to route without pa
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -603,44 +678,62 @@ exports[`navigate to extension page when extension navigates to route without pa
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -711,6 +804,7 @@ exports[`navigate to extension page when extension navigates to route without pa
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/__snapshots__/navigating-between-routes.test.tsx.snap b/src/features/__snapshots__/navigating-between-routes.test.tsx.snap
index ce6dfe219f..f4e6b41559 100644
--- a/src/features/__snapshots__/navigating-between-routes.test.tsx.snap
+++ b/src/features/__snapshots__/navigating-between-routes.test.tsx.snap
@@ -11,44 +11,62 @@ exports[`navigating between routes given route with optional path parameters whe
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -106,6 +124,7 @@ exports[`navigating between routes given route with optional path parameters whe
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -134,44 +153,62 @@ exports[`navigating between routes given route without path parameters when navi
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -226,6 +263,7 @@ exports[`navigating between routes given route without path parameters when navi
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap b/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
index 87957f581a..9044282680 100644
--- a/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
+++ b/src/features/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
@@ -11,44 +11,61 @@ exports[`add-cluster - navigation using application menu renders 1`] = `
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="home-button"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -77,7 +94,7 @@ exports[`add-cluster - navigation using application menu renders 1`] = `
               style="width: 320px;"
             >
               <h2>
-                Welcome to OpenLens!
+                Welcome to some-product-name!
               </h2>
               <p>
                 To get you started we have auto-detected your clusters in your
@@ -183,6 +200,7 @@ exports[`add-cluster - navigation using application menu renders 1`] = `
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -211,44 +229,62 @@ exports[`add-cluster - navigation using application menu when navigating to add
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -279,7 +315,7 @@ exports[`add-cluster - navigation using application menu when navigating to add
               </code>
                file. 
               <a
-                href="https://docs.k8slens.dev/main/catalog/add-cluster/"
+                href="https://docs.k8slens.dev/getting-started/add-cluster/"
                 rel="noreferrer"
                 target="_blank"
               >
@@ -387,6 +423,7 @@ exports[`add-cluster - navigation using application menu when navigating to add
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/add-cluster/navigation-using-application-menu.test.tsx b/src/features/add-cluster/navigation-using-application-menu.test.tsx
index 41d11af30b..19b11672c9 100644
--- a/src/features/add-cluster/navigation-using-application-menu.test.tsx
+++ b/src/features/add-cluster/navigation-using-application-menu.test.tsx
@@ -29,7 +29,11 @@ describe("add-cluster - navigation using application menu", () => {
 
   describe("when navigating to add cluster using application menu", () => {
     beforeEach(async () => {
-      await applicationBuilder.applicationMenu.click("file.add-cluster");
+      await applicationBuilder.applicationMenu.click(
+        "root",
+        "file",
+        "add-cluster",
+      );
     });
 
     it("renders", () => {
diff --git a/src/features/application-menu/__snapshots__/application-menu.test.ts.snap b/src/features/application-menu/__snapshots__/application-menu.test.ts.snap
new file mode 100644
index 0000000000..25ee762fea
--- /dev/null
+++ b/src/features/application-menu/__snapshots__/application-menu.test.ts.snap
@@ -0,0 +1,132 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`application-menu, given platform is 'darwin' given enough time passes populates application menu 1`] = `
+Array [
+  "root",
+  "root -> mac",
+  "root -> mac -> about",
+  "root -> mac -> separator-1",
+  "root -> mac -> navigate-to-preferences",
+  "root -> mac -> navigate-to-extensions",
+  "root -> mac -> separator-2",
+  "root -> mac -> services",
+  "root -> mac -> separator-3",
+  "root -> mac -> hide",
+  "root -> mac -> hide-others",
+  "root -> mac -> unhide",
+  "root -> mac -> separator-4",
+  "root -> mac -> quit",
+  "root -> file",
+  "root -> file -> add-cluster",
+  "root -> file -> separator-1-for-file",
+  "root -> file -> close-window",
+  "root -> edit",
+  "root -> edit -> undo",
+  "root -> edit -> redo",
+  "root -> edit -> separator-1-in-edit",
+  "root -> edit -> cut",
+  "root -> edit -> copy",
+  "root -> edit -> paste",
+  "root -> edit -> delete",
+  "root -> edit -> separator-2-in-edit",
+  "root -> edit -> selectAll",
+  "root -> view",
+  "root -> view -> navigate-to-catalog",
+  "root -> view -> open-command-palette",
+  "root -> view -> separator-1-for-view",
+  "root -> view -> go-back",
+  "root -> view -> go-forward",
+  "root -> view -> reload",
+  "root -> view -> toggle-dev-tools",
+  "root -> view -> separator-2-for-view",
+  "root -> view -> reset-zoom",
+  "root -> view -> zoom-in",
+  "root -> view -> zoom-out",
+  "root -> view -> separator-3-for-view",
+  "root -> view -> toggle-full-screen",
+  "root -> help",
+  "root -> help -> navigate-to-welcome",
+  "root -> help -> open-documentation",
+  "root -> help -> open-support",
+]
+`;
+
+exports[`application-menu, given platform is 'linux' given enough time passes populates application menu 1`] = `
+Array [
+  "root",
+  "root -> file",
+  "root -> file -> add-cluster",
+  "root -> file -> navigate-to-preferences",
+  "root -> file -> navigate-to-extensions",
+  "root -> file -> quit",
+  "root -> edit",
+  "root -> edit -> undo",
+  "root -> edit -> redo",
+  "root -> edit -> separator-1-in-edit",
+  "root -> edit -> cut",
+  "root -> edit -> copy",
+  "root -> edit -> paste",
+  "root -> edit -> delete",
+  "root -> edit -> separator-2-in-edit",
+  "root -> edit -> selectAll",
+  "root -> view",
+  "root -> view -> navigate-to-catalog",
+  "root -> view -> open-command-palette",
+  "root -> view -> separator-1-for-view",
+  "root -> view -> go-back",
+  "root -> view -> go-forward",
+  "root -> view -> reload",
+  "root -> view -> toggle-dev-tools",
+  "root -> view -> separator-2-for-view",
+  "root -> view -> reset-zoom",
+  "root -> view -> zoom-in",
+  "root -> view -> zoom-out",
+  "root -> view -> separator-3-for-view",
+  "root -> view -> toggle-full-screen",
+  "root -> help",
+  "root -> help -> navigate-to-welcome",
+  "root -> help -> open-documentation",
+  "root -> help -> open-support",
+  "root -> help -> about",
+]
+`;
+
+exports[`application-menu, given platform is 'win32' given enough time passes populates application menu 1`] = `
+Array [
+  "root",
+  "root -> file",
+  "root -> file -> add-cluster",
+  "root -> file -> navigate-to-preferences",
+  "root -> file -> navigate-to-extensions",
+  "root -> file -> quit",
+  "root -> edit",
+  "root -> edit -> undo",
+  "root -> edit -> redo",
+  "root -> edit -> separator-1-in-edit",
+  "root -> edit -> cut",
+  "root -> edit -> copy",
+  "root -> edit -> paste",
+  "root -> edit -> delete",
+  "root -> edit -> separator-2-in-edit",
+  "root -> edit -> selectAll",
+  "root -> view",
+  "root -> view -> navigate-to-catalog",
+  "root -> view -> open-command-palette",
+  "root -> view -> separator-1-for-view",
+  "root -> view -> go-back",
+  "root -> view -> go-forward",
+  "root -> view -> reload",
+  "root -> view -> toggle-dev-tools",
+  "root -> view -> separator-2-for-view",
+  "root -> view -> reset-zoom",
+  "root -> view -> zoom-in",
+  "root -> view -> zoom-out",
+  "root -> view -> separator-3-for-view",
+  "root -> view -> toggle-full-screen",
+  "root -> help",
+  "root -> help -> navigate-to-welcome",
+  "root -> help -> open-documentation",
+  "root -> help -> open-support",
+  "root -> help -> about",
+]
+`;
diff --git a/src/features/application-menu/application-menu-in-legacy-extension-api.test.ts b/src/features/application-menu/application-menu-in-legacy-extension-api.test.ts
new file mode 100644
index 0000000000..888f89f251
--- /dev/null
+++ b/src/features/application-menu/application-menu-in-legacy-extension-api.test.ts
@@ -0,0 +1,226 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { noop } from "lodash/fp";
+import { runInAction } from "mobx";
+import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import type { FakeExtensionOptions } from "../../renderer/components/test-utils/get-extension-fake";
+import applicationMenuItemInjectionToken from "./main/menu-items/application-menu-item-injection-token";
+import logErrorInjectable from "../../common/log-error.injectable";
+
+describe("application-menu-in-legacy-extension-api", () => {
+  let builder: ApplicationBuilder;
+  let logErrorMock: jest.Mock;
+
+  beforeEach(async () => {
+    builder = getApplicationBuilder();
+
+    builder.beforeApplicationStart(
+      (mainDi) => {
+        runInAction(() => {
+          mainDi.register(
+            someTopMenuItemInjectable,
+            someNonExtensionBasedMenuItemInjectable,
+          );
+        });
+
+        logErrorMock = jest.fn();
+
+        mainDi.override(logErrorInjectable, () => logErrorMock);
+      },
+    );
+
+    await builder.startHidden();
+  });
+
+  describe("when extension with application menu items is enabled", () => {
+    let onClickMock: jest.Mock;
+    let testExtensionOptions: FakeExtensionOptions;
+
+    beforeEach(() => {
+      onClickMock = jest.fn();
+
+      testExtensionOptions = {
+        id: "some-test-extension",
+        name: "some-extension-name",
+
+        mainOptions: {
+          appMenus: [
+            {
+              id: "some-non-shown-item",
+              parentId: "some-top-menu-item",
+              click: noop,
+              label: "Irrelevant",
+              visible: false,
+            },
+
+            {
+              id: "some-clickable-item",
+              parentId: "some-top-menu-item",
+              click: onClickMock,
+            },
+
+            {
+              parentId: "some-top-menu-item",
+              type: "separator",
+            },
+
+            {
+              id: "some-os-action-menu-item-id",
+              parentId: "some-top-menu-item",
+              role: "help",
+            },
+
+            {
+              id: "some-submenu-with-explicit-children",
+              parentId: "some-top-menu-item",
+
+              submenu: [
+                { id: "some-explicit-child", label: "Some explicit child", click: noop },
+              ],
+            },
+          ],
+        },
+      };
+
+      builder.extensions.enable(testExtensionOptions);
+    });
+
+    it("related menu items exist", () => {
+      const menuItemPathsForExtension = builder.applicationMenu.items.filter(
+        (x) =>
+          x.join(".").startsWith("root.some-top-menu-item.some-extension-name"),
+      );
+
+      expect(menuItemPathsForExtension).toEqual([
+        ["root", "some-top-menu-item", "some-extension-name/some-clickable-item"],
+        // Note: anonymous index "1" is used by the non-visible menu item.
+        ["root", "some-top-menu-item", "some-extension-name/2-separator"],
+        ["root", "some-top-menu-item", "some-extension-name/some-os-action-menu-item-id"],
+        ["root", "some-top-menu-item", "some-extension-name/some-submenu-with-explicit-children"],
+        ["root", "some-top-menu-item", "some-extension-name/some-submenu-with-explicit-children", "some-extension-name/some-submenu-with-explicit-children/some-explicit-child"],
+      ]);
+    });
+
+    it("when the extension-based clickable menu item is clicked, does so", () => {
+      builder.applicationMenu.click(
+        "root", "some-top-menu-item", "some-extension-name/some-clickable-item",
+      );
+
+      expect(onClickMock).toHaveBeenCalled();
+    });
+
+    describe("when the extension is disabled", () => {
+      beforeEach(() => {
+        builder.extensions.disable(testExtensionOptions);
+      });
+
+      it("when related menu items no longer exist", () => {
+        const menuItemPathsForExtension = builder.applicationMenu.items.filter(
+          (x) =>
+            x.join(".").startsWith("root.some-top-menu-item.some-extension-name"),
+        );
+
+        expect(menuItemPathsForExtension).toEqual([]);
+      });
+
+      it("when the extension is enabled again, also related menu items exist again", () => {
+        builder.extensions.enable(testExtensionOptions);
+
+        const menuItemPathsForExtension = builder.applicationMenu.items.filter(
+          (x) =>
+            x.join(".").startsWith("root.some-top-menu-item.some-extension-name"),
+        );
+
+        expect(menuItemPathsForExtension).toEqual([
+          ["root", "some-top-menu-item", "some-extension-name/some-clickable-item"],
+          ["root", "some-top-menu-item", "some-extension-name/2-separator"],
+          ["root", "some-top-menu-item", "some-extension-name/some-os-action-menu-item-id"],
+          ["root", "some-top-menu-item", "some-extension-name/some-submenu-with-explicit-children"],
+          ["root", "some-top-menu-item", "some-extension-name/some-submenu-with-explicit-children", "some-extension-name/some-submenu-with-explicit-children/some-explicit-child"],
+        ]);
+      });
+    });
+  });
+
+  describe("when extension with unrecognizable application menu items is enabled", () => {
+
+    beforeEach(() => {
+      const testExtensionOptions: FakeExtensionOptions = {
+        id: "some-test-extension",
+        name: "some-extension-name",
+
+        mainOptions: {
+          appMenus: [
+            {
+              id: "some-recognizable-item",
+              parentId: "some-top-menu-item",
+              click: noop,
+            },
+
+            {
+              id: "some-unrecognizable-item",
+              parentId: "some-top-menu-item",
+              // Note: there is no way to recognize this
+              // click: noop,
+              // role: "help"
+              // submenu: []
+              // type: "separator"
+            },
+          ],
+        },
+      };
+
+      builder.extensions.enable(testExtensionOptions);
+    });
+
+    it("only recognizable menu items from extension exist", () => {
+      const menuItemPathsForExtension = builder.applicationMenu.items.filter(
+        (x) =>
+          x.join(".").startsWith("root.some-top-menu-item.some-extension-name"),
+      );
+
+      expect(menuItemPathsForExtension).toEqual([
+        ["root", "some-top-menu-item", "some-extension-name/some-recognizable-item"],
+      ]);
+    });
+
+    it("logs about the unrecognizable item", () => {
+      expect(logErrorMock).toHaveBeenCalledWith(
+        '[MENU]: Tried to register menu item "some-extension-name/some-unrecognizable-item" but it is not recognizable as any of ApplicationMenuItemTypes',
+      );
+    });
+  });
+});
+
+const someTopMenuItemInjectable = getInjectable({
+  id: "some-top-menu-item",
+
+  instantiate: () => ({
+    id: "some-top-menu-item",
+    parentId: "root" as const,
+    kind: "top-level-menu" as const,
+    label: "Some existing root menu item",
+    orderNumber: 42,
+  }),
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+const someNonExtensionBasedMenuItemInjectable = getInjectable({
+  id: "some-non-extension-based-menu-item",
+
+  instantiate: () => ({
+    id: "some-non-extension-based-menu-item",
+    parentId: "some-top-menu-item",
+    kind: "clickable-menu-item" as const,
+    label: "Some menu item",
+    onClick: () => {},
+    orderNumber: 42,
+  }),
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
diff --git a/src/features/application-menu/application-menu.test.ts b/src/features/application-menu/application-menu.test.ts
new file mode 100644
index 0000000000..e0128b83fb
--- /dev/null
+++ b/src/features/application-menu/application-menu.test.ts
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import populateApplicationMenuInjectable from "./main/populate-application-menu.injectable";
+import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time";
+import { getCompositePaths } from "../../common/utils/composite/get-composite-paths/get-composite-paths";
+import platformInjectable, { allPlatforms } from "../../common/vars/platform.injectable";
+
+describe.each(allPlatforms)("application-menu, given platform is '%s'", (platform) => {
+  let builder: ApplicationBuilder;
+  let populateApplicationMenuMock: jest.Mock;
+
+  beforeEach(async () => {
+    useFakeTime();
+
+    populateApplicationMenuMock = jest.fn();
+
+    builder = getApplicationBuilder();
+
+    builder.beforeApplicationStart((mainDi) => {
+      mainDi.override(platformInjectable, () => platform);
+
+      mainDi.override(
+        populateApplicationMenuInjectable,
+        () => populateApplicationMenuMock,
+      );
+    });
+
+    await builder.startHidden();
+  });
+
+  it("when insufficient time passes, does not populate menu items yet", () => {
+    advanceFakeTime(99);
+
+    expect(populateApplicationMenuMock).not.toHaveBeenCalled();
+  });
+
+  describe("given enough time passes", () => {
+    let applicationMenuPaths: string[][];
+
+    beforeEach(() => {
+      advanceFakeTime(100);
+      applicationMenuPaths = getCompositePaths(
+        populateApplicationMenuMock.mock.calls[0][0],
+      );
+    });
+
+    it("populates application menu with at least something", () => {
+      expect(applicationMenuPaths.length).toBeGreaterThan(0);
+    });
+
+    it("populates application menu", () => {
+      expect(applicationMenuPaths.map(x => x.join(" -> "))).toMatchSnapshot();
+    });
+  });
+});
diff --git a/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts b/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts
new file mode 100644
index 0000000000..7cae6d0079
--- /dev/null
+++ b/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts
@@ -0,0 +1,81 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import populateApplicationMenuInjectable from "./main/populate-application-menu.injectable";
+import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time";
+import { getCompositePaths } from "../../common/utils/composite/get-composite-paths/get-composite-paths";
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "./main/menu-items/application-menu-item-injection-token";
+import { runInAction } from "mobx";
+import logErrorInjectable from "../../common/log-error.injectable";
+
+describe("handling-of-orphan-application-menu-items, given orphan menu item", () => {
+  let builder: ApplicationBuilder;
+  let populateApplicationMenuMock: jest.Mock;
+  let logErrorMock: jest.Mock;
+
+  beforeEach(async () => {
+    useFakeTime();
+
+    populateApplicationMenuMock = jest.fn();
+    logErrorMock = jest.fn();
+
+    builder = getApplicationBuilder();
+
+    builder.beforeApplicationStart((mainDi) => {
+      const someOrphanMenuItemInjectable = getInjectable({
+        id: "some-orphan-menu-item",
+        instantiate: () => ({
+          kind: "sub-menu" as const,
+          id: "some-item-id",
+          // Note: unknown id makes this item an orphan.
+          parentId: "some-unknown-parent-id",
+          orderNumber: 0,
+          label: "irrelevant",
+        }),
+
+        injectionToken: applicationMenuItemInjectionToken,
+      });
+
+      runInAction(() => {
+        mainDi.register(someOrphanMenuItemInjectable);
+      });
+
+      mainDi.override(logErrorInjectable, () => logErrorMock);
+
+      mainDi.override(
+        populateApplicationMenuInjectable,
+        () => populateApplicationMenuMock,
+      );
+    });
+
+    await builder.startHidden();
+  });
+
+  describe("given some time passes", () => {
+    let applicationMenuPaths: string[][];
+
+    beforeEach(() => {
+      advanceFakeTime(100);
+
+      applicationMenuPaths = getCompositePaths(
+        populateApplicationMenuMock.mock.calls[0][0],
+      );
+    });
+
+    it("keeps showing the other application menu items without throwing", () => {
+      expect(applicationMenuPaths.length).toBeGreaterThan(0);
+    });
+
+    it("does not show orphan application menu item", () => {
+      expect(applicationMenuPaths.find(x => x.join(".").endsWith("some-item-id")));
+    });
+
+    it("logs about bad menu item", () => {
+      expect(logErrorMock).toHaveBeenCalledWith('[MENU]: cannot render menu item for missing parentIds: "some-unknown-parent-id"');
+    });
+  });
+});
diff --git a/src/features/application-menu/main/application-menu-item-composite.injectable.ts b/src/features/application-menu/main/application-menu-item-composite.injectable.ts
new file mode 100644
index 0000000000..b9012fb67b
--- /dev/null
+++ b/src/features/application-menu/main/application-menu-item-composite.injectable.ts
@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemsInjectable from "./application-menu-items.injectable";
+import type { Composite } from "../../../common/utils/composite/get-composite/get-composite";
+import { getCompositeFor } from "../../../common/utils/composite/get-composite/get-composite";
+import { computed } from "mobx";
+import { pipeline } from "@ogre-tools/fp";
+import type { ApplicationMenuItemTypes } from "./menu-items/application-menu-item-injection-token";
+import type { RootComposite } from "../../../common/utils/composite/interfaces";
+import type { Discriminable } from "../../../common/utils/composable-responsibilities/discriminable/discriminable";
+import { orderByOrderNumber } from "../../../common/utils/composable-responsibilities/orderable/orderable";
+import logErrorInjectable from "../../../common/log-error.injectable";
+import { isShown } from "../../../common/utils/composable-responsibilities/showable/showable";
+
+export type MenuItemRoot = Discriminable<"root"> & RootComposite<"root">;
+
+const applicationMenuItemCompositeInjectable = getInjectable({
+  id: "application-menu-item-composite",
+
+  instantiate: (di) => {
+    const menuItems = di.inject(applicationMenuItemsInjectable);
+    const logError = di.inject(logErrorInjectable);
+
+    return computed((): Composite<ApplicationMenuItemTypes | MenuItemRoot> => {
+      const items = menuItems.get();
+
+      return pipeline(
+        [
+          {
+            parentId: undefined,
+            id: "root",
+            kind: "root",
+          } as const,
+
+          ...items,
+        ],
+
+        getCompositeFor({
+          getId: (x) => x.id,
+          getParentId: (x) => x.parentId,
+          transformChildren: (children) =>
+            pipeline(
+              children,
+              orderByOrderNumber,
+              (children) => children.filter(isShown),
+            ),
+
+          handleMissingParentIds: ({ missingParentIds }) => {
+            logError(
+              `[MENU]: cannot render menu item for missing parentIds: "${missingParentIds.join(
+                '", "',
+              )}"`,
+            );
+          },
+        }),
+      );
+    });
+  },
+});
+
+export default applicationMenuItemCompositeInjectable;
diff --git a/src/features/application-menu/main/application-menu-item-registrator.injectable.ts b/src/features/application-menu/main/application-menu-item-registrator.injectable.ts
new file mode 100644
index 0000000000..8c3d635db0
--- /dev/null
+++ b/src/features/application-menu/main/application-menu-item-registrator.injectable.ts
@@ -0,0 +1,158 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { Injectable } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
+import { extensionRegistratorInjectionToken } from "../../../extensions/extension-loader/extension-registrator-injection-token";
+import type { LensExtension } from "../../../extensions/lens-extension";
+import type { LensMainExtension } from "../../../extensions/lens-main-extension";
+import type {
+  ApplicationMenuItemTypes,
+  ClickableMenuItem,
+  OsActionMenuItem,
+  Separator,
+} from "./menu-items/application-menu-item-injection-token";
+import applicationMenuItemInjectionToken from "./menu-items/application-menu-item-injection-token";
+import type { MenuRegistration } from "./menu-registration";
+import logErrorInjectable from "../../../common/log-error.injectable";
+
+const applicationMenuItemRegistratorInjectable = getInjectable({
+  id: "application-menu-item-registrator",
+
+  instantiate: (di) => {
+    const logError = di.inject(logErrorInjectable);
+    const toRecursedInjectables = toRecursedInjectablesFor(logError);
+
+    return (ext: LensExtension) => {
+      const extension = ext as LensMainExtension;
+
+      return extension.appMenus.flatMap(
+        toRecursedInjectables([extension.sanitizedExtensionId]),
+      );
+    };
+  },
+
+  injectionToken: extensionRegistratorInjectionToken,
+});
+
+export default applicationMenuItemRegistratorInjectable;
+
+const toRecursedInjectablesFor = (logError: (errorMessage: string) => void) => {
+  const toRecursedInjectables = (previousIdPath: string[]) =>
+    (
+      registration: MenuRegistration,
+      index: number,
+      // Todo: new version of injectable would require less type parameters with defaults.
+    ): Injectable<
+      ApplicationMenuItemTypes,
+      ApplicationMenuItemTypes,
+      void
+      >[] => {
+      const previousIdPathString = previousIdPath.join("/");
+      const registrationId = registration.id || index.toString();
+      const currentIdPath = [...previousIdPath, registrationId];
+      const currentIdPathString = currentIdPath.join("/");
+      const parentId = registration.parentId || previousIdPathString;
+
+      const menuItem = getApplicationMenuItem({
+        registration,
+        parentId,
+        currentIdPathString,
+        index,
+      });
+
+      if (!menuItem) {
+        logError(`[MENU]: Tried to register menu item "${currentIdPathString}" but it is not recognizable as any of ApplicationMenuItemTypes`);
+
+        return [];
+      }
+
+      return [
+        getInjectable({
+          id: `${currentIdPathString}/application-menu-item`,
+
+          instantiate: () => menuItem,
+
+          injectionToken: applicationMenuItemInjectionToken,
+        }),
+
+        ...((registration.submenu as MenuRegistration[])
+          ? (registration.submenu as MenuRegistration[]).flatMap(
+            toRecursedInjectables(currentIdPath),
+          )
+          : []),
+      ];
+    };
+
+  return toRecursedInjectables;
+};
+
+const getApplicationMenuItem = ({
+  registration,
+  index,
+  currentIdPathString,
+  parentId,
+}: {
+  registration: MenuRegistration;
+  index: number;
+  currentIdPathString: string;
+  parentId: string;
+}): ApplicationMenuItemTypes | undefined => {
+  const orderNumber = 1000 + index * 10;
+
+  if (registration.type === "separator") {
+    return {
+      kind: "separator" as const,
+      id: `${currentIdPathString}-separator`,
+      parentId,
+      orderNumber,
+    } as Separator;
+  }
+
+  if (registration.submenu) {
+    return {
+      kind: "sub-menu" as const,
+      id: currentIdPathString,
+      parentId,
+      isShown: registration.visible ?? true,
+      orderNumber,
+      label: registration.label || "",
+    };
+  }
+
+  if (registration.click) {
+    return {
+      kind: "clickable-menu-item" as const,
+      id: currentIdPathString,
+      parentId,
+      // Todo: hide electron events from this abstraction.
+      onClick: registration.click,
+      label: registration.label,
+      isShown: registration.visible ?? true,
+      orderNumber,
+
+      ...(registration.accelerator
+        ? { keyboardShortcut: registration.accelerator as string }
+        : {}),
+    } as ClickableMenuItem;
+  }
+
+  if (registration.role) {
+    return {
+      kind: "os-action-menu-item" as const,
+      id: currentIdPathString,
+      parentId,
+      label: registration.label,
+      isShown: registration.visible ?? true,
+      orderNumber,
+      actionName: registration.role,
+
+      ...(registration.accelerator
+        ? { keyboardShortcut: registration.accelerator as string }
+        : {}),
+    } as OsActionMenuItem;
+  }
+
+  return undefined;
+};
diff --git a/src/features/application-menu/main/application-menu-items.injectable.ts b/src/features/application-menu/main/application-menu-items.injectable.ts
new file mode 100644
index 0000000000..7cb8cd3ef4
--- /dev/null
+++ b/src/features/application-menu/main/application-menu-items.injectable.ts
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { MenuItemConstructorOptions } from "electron";
+import { computed } from "mobx";
+import applicationMenuItemInjectionToken from "./menu-items/application-menu-item-injection-token";
+import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
+
+export interface MenuItemOpts extends MenuItemConstructorOptions {
+  submenu?: MenuItemConstructorOptions[];
+}
+
+const applicationMenuItemsInjectable = getInjectable({
+  id: "application-menu-items",
+
+  instantiate: (di) => {
+    const computedInjectMany = di.inject(computedInjectManyInjectable);
+
+    return computed(() =>
+      computedInjectMany(applicationMenuItemInjectionToken).get(),
+    );
+  },
+});
+
+
+export default applicationMenuItemsInjectable;
diff --git a/src/features/application-menu/main/application-menu-reactivity.injectable.ts b/src/features/application-menu/main/application-menu-reactivity.injectable.ts
new file mode 100644
index 0000000000..80bfd108fd
--- /dev/null
+++ b/src/features/application-menu/main/application-menu-reactivity.injectable.ts
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { autorun } from "mobx";
+import { getStartableStoppable } from "../../../common/utils/get-startable-stoppable";
+import populateApplicationMenuInjectable from "./populate-application-menu.injectable";
+import applicationMenuItemCompositeInjectable from "./application-menu-item-composite.injectable";
+
+const applicationMenuReactivityInjectable = getInjectable({
+  id: "application-menu-reactivity",
+
+  instantiate: (di) => {
+    const applicationMenuItemComposite = di.inject(applicationMenuItemCompositeInjectable);
+    const populateApplicationMenu = di.inject(populateApplicationMenuInjectable);
+
+    return getStartableStoppable(
+      "application-menu-reactivity",
+      () => autorun(() => populateApplicationMenu(applicationMenuItemComposite.get()), {
+        delay: 100,
+      }),
+    );
+  },
+});
+
+export default applicationMenuReactivityInjectable;
diff --git a/src/features/application-menu/main/menu-items/application-menu-item-injection-token.ts b/src/features/application-menu/main/menu-items/application-menu-item-injection-token.ts
new file mode 100644
index 0000000000..b90e5e1612
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/application-menu-item-injection-token.ts
@@ -0,0 +1,91 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectionToken } from "@ogre-tools/injectable";
+import type { BrowserWindow, KeyboardEvent, MenuItemConstructorOptions, MenuItem as ElectronMenuItem } from "electron";
+import type { SetOptional } from "type-fest";
+import type { ChildOfParentComposite, ParentOfChildComposite } from "../../../../common/utils/composite/interfaces";
+import type { MaybeShowable } from "../../../../common/utils/composable-responsibilities/showable/showable";
+import type { Discriminable } from "../../../../common/utils/composable-responsibilities/discriminable/discriminable";
+import type { Orderable } from "../../../../common/utils/composable-responsibilities/orderable/orderable";
+
+export interface MayHaveKeyboardShortcut {
+  keyboardShortcut?: string;
+}
+
+export interface ElectronClickable {
+  // TODO: This leaky abstraction is exposed in Extension API, therefore cannot be updated
+  onClick: (menuItem: ElectronMenuItem, browserWindow: (BrowserWindow) | (undefined), event: KeyboardEvent) => void;
+}
+
+export interface Labeled {
+  label: string;
+}
+
+export interface MaybeLabeled extends SetOptional<Labeled, "label"> {}
+
+type ApplicationMenuItemType<T extends string> =
+  // Note: "kind" is being used for Discriminated unions of TypeScript to achieve type narrowing.
+  // See: https://www.typescriptlang.org/docs/handbook/2/narrowing.html#discriminated-unions
+  & Discriminable<T>
+  & ParentOfChildComposite
+  & ChildOfParentComposite
+  & MaybeShowable
+  & Orderable;
+
+export type TopLevelMenu =
+  & ApplicationMenuItemType<"top-level-menu">
+  & { parentId: "root" }
+  & Labeled
+  & MayHaveElectronRole;
+
+interface MayHaveElectronRole {
+  role?: ElectronRoles;
+}
+
+type ElectronRoles = Exclude<MenuItemConstructorOptions["role"], undefined>;
+
+export type SubMenu =
+  & ApplicationMenuItemType<"sub-menu">
+  & Labeled
+  & ChildOfParentComposite;
+
+export type ClickableMenuItem =
+  & ApplicationMenuItemType<"clickable-menu-item">
+  & MenuItem
+  & Labeled
+  & ElectronClickable;
+
+export type OsActionMenuItem =
+  & ApplicationMenuItemType<"os-action-menu-item">
+  & MenuItem
+  & MaybeLabeled
+  & TriggersElectronAction;
+
+type MenuItem =
+  & ChildOfParentComposite
+  & MayHaveKeyboardShortcut;
+
+interface TriggersElectronAction {
+  actionName: ElectronRoles;
+}
+
+// Todo: SeparatorMenuItem
+export type Separator =
+  & ApplicationMenuItemType<"separator">
+  & ChildOfParentComposite;
+
+export type ApplicationMenuItemTypes =
+  | TopLevelMenu
+  | SubMenu
+  | OsActionMenuItem
+  | ClickableMenuItem
+  | Separator
+;
+
+const applicationMenuItemInjectionToken = getInjectionToken<ApplicationMenuItemTypes>({
+  id: "application-menu-item-injection-token",
+});
+
+export default applicationMenuItemInjectionToken;
diff --git a/src/features/application-menu/main/menu-items/edit/edit-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/edit/edit-menu-item.injectable.ts
new file mode 100644
index 0000000000..f62a4221ac
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/edit/edit-menu-item.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../application-menu-item-injection-token";
+
+const editMenuItemInjectable = getInjectable({
+  id: "edit-application-menu-item",
+
+  instantiate: () => ({
+    kind: "top-level-menu" as const,
+    id: "edit",
+    parentId: "root" as const,
+    orderNumber: 30,
+    label: "Edit",
+  }),
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default editMenuItemInjectable;
diff --git a/src/features/application-menu/main/menu-items/edit/operation-system-actions/operation-system-actions.injectable.ts b/src/features/application-menu/main/menu-items/edit/operation-system-actions/operation-system-actions.injectable.ts
new file mode 100644
index 0000000000..aea229cc68
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/edit/operation-system-actions/operation-system-actions.injectable.ts
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getApplicationMenuOperationSystemActionInjectable } from "../../get-application-menu-operation-system-action-injectable";
+import { getApplicationMenuSeparatorInjectable } from "../../get-application-menu-separator-injectable";
+
+export const actionForUndo = getApplicationMenuOperationSystemActionInjectable({
+  id: "undo",
+  parentId: "edit",
+  orderNumber: 10,
+  actionName: "undo",
+});
+
+export const actionForRedo = getApplicationMenuOperationSystemActionInjectable({
+  id: "redo",
+  parentId: "edit",
+  orderNumber: 20,
+  actionName: "redo",
+});
+
+export const separator1 = getApplicationMenuSeparatorInjectable({
+  id: "separator-1-in-edit",
+  parentId: "edit",
+  orderNumber: 30,
+});
+
+export const actionForCut = getApplicationMenuOperationSystemActionInjectable({
+  id: "cut",
+  parentId: "edit",
+  orderNumber: 40,
+  actionName: "cut",
+});
+
+export const actionForCopy = getApplicationMenuOperationSystemActionInjectable({
+  id: "copy",
+  parentId: "edit",
+  orderNumber: 50,
+  actionName: "copy",
+});
+
+export const actionForPaste = getApplicationMenuOperationSystemActionInjectable({
+  id: "paste",
+  parentId: "edit",
+  orderNumber: 60,
+  actionName: "paste",
+});
+
+export const actionForDelete = getApplicationMenuOperationSystemActionInjectable({
+  id: "delete",
+  parentId: "edit",
+  orderNumber: 70,
+  actionName: "delete",
+});
+
+export const separator2 = getApplicationMenuSeparatorInjectable({
+  id: "separator-2-in-edit",
+  parentId: "edit",
+  orderNumber: 80,
+});
+
+export const actionForSelectAll = getApplicationMenuOperationSystemActionInjectable({
+  id: "selectAll",
+  parentId: "edit",
+  orderNumber: 90,
+  actionName: "selectAll",
+});
+
diff --git a/src/features/application-menu/main/menu-items/file/add-cluster/add-cluster-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/file/add-cluster/add-cluster-menu-item.injectable.ts
new file mode 100644
index 0000000000..78c7201ca6
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/file/add-cluster/add-cluster-menu-item.injectable.ts
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
+import navigateToAddClusterInjectable from "../../../../../../common/front-end-routing/routes/add-cluster/navigate-to-add-cluster.injectable";
+
+const addClusterMenuItemInjectable = getInjectable({
+  id: "add-cluster-application-menu-item",
+
+  instantiate: (di) => {
+    const navigateToAddCluster = di.inject(navigateToAddClusterInjectable);
+
+    return {
+      kind: "clickable-menu-item" as const,
+      parentId: "file",
+      id: "add-cluster",
+      orderNumber: 10,
+      label: "Add Cluster",
+      keyboardShortcut: "CmdOrCtrl+Shift+A",
+
+      onClick: () => {
+        navigateToAddCluster();
+      },
+    };
+  },
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default addClusterMenuItemInjectable;
diff --git a/src/features/application-menu/main/menu-items/file/close-window/close-window-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/file/close-window/close-window-menu-item.injectable.ts
new file mode 100644
index 0000000000..745adb55df
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/file/close-window/close-window-menu-item.injectable.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
+import isMacInjectable from "../../../../../../common/vars/is-mac.injectable";
+
+const closeWindowMenuItemInjectable = getInjectable({
+  id: "close-window-application-menu-item",
+
+  instantiate: (di) => {
+    const isMac = di.inject(isMacInjectable);
+
+    return {
+      id: "close-window",
+      kind: "os-action-menu-item" as const,
+      parentId: "file",
+      orderNumber: 60,
+      actionName: "close" as const,
+      label: "Close Window",
+      keyboardShortcut: "Shift+Cmd+W",
+      isShown: isMac,
+    };
+  },
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default closeWindowMenuItemInjectable;
diff --git a/src/features/application-menu/main/menu-items/file/file-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/file/file-menu-item.injectable.ts
new file mode 100644
index 0000000000..dce2bb5cef
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/file/file-menu-item.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../application-menu-item-injection-token";
+
+const fileMenuItemInjectable = getInjectable({
+  id: "file-application-menu-item",
+
+  instantiate: () => ({
+    kind: "top-level-menu" as const,
+    id: "file",
+    parentId: "root" as const,
+    orderNumber: 20,
+    label: "File",
+  }),
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default fileMenuItemInjectable;
diff --git a/src/features/application-menu/main/menu-items/file/separators/separators.injectable.ts b/src/features/application-menu/main/menu-items/file/separators/separators.injectable.ts
new file mode 100644
index 0000000000..a0f2cbe5d8
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/file/separators/separators.injectable.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import {
+  getApplicationMenuSeparatorInjectable,
+} from "../../get-application-menu-separator-injectable";
+
+export const separator1 = getApplicationMenuSeparatorInjectable({
+  id: "separator-1-for-file",
+  parentId: "file",
+  orderNumber: 20,
+  isShownOnlyOnMac: true,
+});
diff --git a/src/features/application-menu/main/menu-items/get-application-menu-operation-system-action-injectable.ts b/src/features/application-menu/main/menu-items/get-application-menu-operation-system-action-injectable.ts
new file mode 100644
index 0000000000..ebe6a6865e
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/get-application-menu-operation-system-action-injectable.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { OsActionMenuItem } from "./application-menu-item-injection-token";
+import applicationMenuItemInjectionToken from "./application-menu-item-injection-token";
+
+const getApplicationMenuOperationSystemActionInjectable = ({
+  id,
+  ...rest
+}: Omit<OsActionMenuItem, "kind" >) =>
+  getInjectable({
+    id: `application-menu-operation-system-action/${id}`,
+
+    instantiate: () => ({
+      ...rest,
+      id,
+      kind: "os-action-menu-item" as const,
+    }),
+
+    injectionToken: applicationMenuItemInjectionToken,
+  });
+
+export { getApplicationMenuOperationSystemActionInjectable };
diff --git a/src/features/application-menu/main/menu-items/get-application-menu-separator-injectable.ts b/src/features/application-menu/main/menu-items/get-application-menu-separator-injectable.ts
new file mode 100644
index 0000000000..d9eb1677cc
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/get-application-menu-separator-injectable.ts
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { Separator } from "./application-menu-item-injection-token";
+import applicationMenuItemInjectionToken from "./application-menu-item-injection-token";
+import isMacInjectable from "../../../../common/vars/is-mac.injectable";
+
+const getApplicationMenuSeparatorInjectable = ({
+  id,
+  isShownOnlyOnMac = false,
+  ...rest
+}: { isShownOnlyOnMac?: boolean } & Omit<
+  Separator,
+  "kind" | "isShown"
+>) =>
+  getInjectable({
+    id: `application-menu-separator/${id}`,
+
+    instantiate: (di) => {
+      const isMac = di.inject(isMacInjectable);
+      const isShown = isShownOnlyOnMac ? isMac : true;
+
+      return {
+        ...rest,
+        id,
+        kind: "separator" as const,
+        isShown,
+      };
+    },
+
+    injectionToken: applicationMenuItemInjectionToken,
+  });
+
+export { getApplicationMenuSeparatorInjectable };
diff --git a/src/features/application-menu/main/menu-items/help/help-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/help/help-menu-item.injectable.ts
new file mode 100644
index 0000000000..5b83115362
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/help/help-menu-item.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../application-menu-item-injection-token";
+
+const helpMenuItemInjectable = getInjectable({
+  id: "help-application-menu-item",
+
+  instantiate: () => ({
+    kind: "top-level-menu" as const,
+    id: "help",
+    parentId: "root" as const,
+    orderNumber: 50,
+    label: "Help",
+    role: "help" as const,
+  }),
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default helpMenuItemInjectable;
diff --git a/src/features/application-menu/main/menu-items/help/navigate-to-welcome/navigate-to-extensions-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/help/navigate-to-welcome/navigate-to-extensions-menu-item.injectable.ts
new file mode 100644
index 0000000000..10100ecb4c
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/help/navigate-to-welcome/navigate-to-extensions-menu-item.injectable.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
+import navigateToWelcomeInjectable from "../../../../../../common/front-end-routing/routes/welcome/navigate-to-welcome.injectable";
+
+const navigateToWelcomeMenuItem = getInjectable({
+  id: "navigate-to-welcome-menu-item",
+
+  instantiate: (di) => {
+    const navigateToWelcome = di.inject(navigateToWelcomeInjectable);
+
+    return {
+      kind: "clickable-menu-item" as const,
+      parentId: "help",
+      id: "navigate-to-welcome",
+      orderNumber: 10,
+      label: "Welcome",
+
+      onClick: () => {
+        navigateToWelcome();
+      },
+    };
+  },
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default navigateToWelcomeMenuItem;
diff --git a/src/features/application-menu/main/menu-items/help/open-documentation/open-documentation-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/help/open-documentation/open-documentation-menu-item.injectable.ts
new file mode 100644
index 0000000000..ca63120810
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/help/open-documentation/open-documentation-menu-item.injectable.ts
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
+import { docsUrl } from "../../../../../../common/vars";
+import openLinkInBrowserInjectable from "../../../../../../common/utils/open-link-in-browser.injectable";
+import loggerInjectable from "../../../../../../common/logger.injectable";
+
+const openDocumentationMenuItemInjectable = getInjectable({
+  id: "open-documentation-menu-item",
+
+  instantiate: (di) => {
+    const openLinkInBrowser = di.inject(openLinkInBrowserInjectable);
+    const logger = di.inject(loggerInjectable);
+
+    return {
+      kind: "clickable-menu-item" as const,
+      parentId: "help",
+      id: "open-documentation",
+      orderNumber: 20,
+      label: "Documentation",
+
+      // TODO: Convert to async/await
+      onClick: () => {
+        openLinkInBrowser(docsUrl).catch((error) => {
+          logger.error("[MENU]: failed to open browser", { error });
+        });
+      },
+    };
+  },
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default openDocumentationMenuItemInjectable;
diff --git a/src/features/application-menu/main/menu-items/help/open-support/open-support-item.injectable.ts b/src/features/application-menu/main/menu-items/help/open-support/open-support-item.injectable.ts
new file mode 100644
index 0000000000..7a1db63078
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/help/open-support/open-support-item.injectable.ts
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
+import { supportUrl } from "../../../../../../common/vars";
+import openLinkInBrowserInjectable from "../../../../../../common/utils/open-link-in-browser.injectable";
+import loggerInjectable from "../../../../../../common/logger.injectable";
+
+const openSupportItemInjectable = getInjectable({
+  id: "open-support-menu-item",
+
+  instantiate: (di) => {
+    const openLinkInBrowser = di.inject(openLinkInBrowserInjectable);
+    const logger = di.inject(loggerInjectable);
+
+    return {
+      kind: "clickable-menu-item" as const,
+      parentId: "help",
+      id: "open-support",
+      orderNumber: 30,
+      label: "Support",
+
+      // TODO: Convert to async/await
+      onClick: () => {
+        openLinkInBrowser(supportUrl).catch((error) => {
+          logger.error("[MENU]: failed to open browser", { error });
+        });
+      },
+    };
+  },
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default openSupportItemInjectable;
diff --git a/src/features/application-menu/main/menu-items/special-menu-for-mac-application/navigate-to-extensions/navigate-to-extensions-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/navigate-to-extensions/navigate-to-extensions-menu-item.injectable.ts
new file mode 100644
index 0000000000..40aa366280
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/navigate-to-extensions/navigate-to-extensions-menu-item.injectable.ts
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
+import navigateToExtensionsInjectable from "../../../../../../common/front-end-routing/routes/extensions/navigate-to-extensions.injectable";
+import isMacInjectable from "../../../../../../common/vars/is-mac.injectable";
+
+const navigateToExtensionsMenuItem = getInjectable({
+  id: "navigate-to-extensions-menu-item",
+
+  instantiate: (di) => {
+    const navigateToExtensions = di.inject(navigateToExtensionsInjectable);
+    const isMac = di.inject(isMacInjectable);
+
+    return {
+      kind: "clickable-menu-item" as const,
+      parentId: isMac ? "mac" : "file",
+      id: "navigate-to-extensions",
+      orderNumber: isMac ? 50 : 40,
+      label: "Extensions",
+      keyboardShortcut: isMac ? "CmdOrCtrl+Shift+E" : "Ctrl+Shift+E",
+
+      onClick: () => {
+        navigateToExtensions();
+      },
+    };
+  },
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default navigateToExtensionsMenuItem;
diff --git a/src/features/application-menu/main/menu-items/special-menu-for-mac-application/operation-system-actions/operation-system-actions.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/operation-system-actions/operation-system-actions.injectable.ts
new file mode 100644
index 0000000000..1c78d81031
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/operation-system-actions/operation-system-actions.injectable.ts
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import {
+  getApplicationMenuOperationSystemActionInjectable,
+} from "../../get-application-menu-operation-system-action-injectable";
+
+export const actionForServices = getApplicationMenuOperationSystemActionInjectable({
+  id: "services",
+  parentId: "mac",
+  orderNumber: 80,
+  actionName: "services",
+});
+
+export const actionForHide = getApplicationMenuOperationSystemActionInjectable({
+  id: "hide",
+  parentId: "mac",
+  orderNumber: 100,
+  actionName: "hide",
+});
+
+export const actionForHideOthers = getApplicationMenuOperationSystemActionInjectable({
+  id: "hide-others",
+  parentId: "mac",
+  orderNumber: 110,
+  actionName: "hideOthers",
+});
+
+export const actionForUnhide = getApplicationMenuOperationSystemActionInjectable({
+  id: "unhide",
+  parentId: "mac",
+  orderNumber: 120,
+  actionName: "unhide",
+});
diff --git a/src/features/application-menu/main/menu-items/special-menu-for-mac-application/primary-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/primary-menu-item.injectable.ts
new file mode 100644
index 0000000000..b85df1d511
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/primary-menu-item.injectable.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../application-menu-item-injection-token";
+import appNameInjectable from "../../../../../common/vars/app-name.injectable";
+import isMacInjectable from "../../../../../common/vars/is-mac.injectable";
+
+const primaryMenuItemInjectable = getInjectable({
+  id: "primary-application-menu-item",
+
+  instantiate: (di) => {
+    const appName = di.inject(appNameInjectable);
+    const isMac = di.inject(isMacInjectable);
+
+    return {
+      kind: "top-level-menu" as const,
+      parentId: "root" as const,
+      id: "mac",
+      orderNumber: 10,
+      label: appName,
+      isShown: isMac,
+    };
+  },
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default primaryMenuItemInjectable;
diff --git a/src/features/application-menu/main/menu-items/special-menu-for-mac-application/quit-application/quit-application-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/quit-application/quit-application-menu-item.injectable.ts
new file mode 100644
index 0000000000..71f7cde125
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/quit-application/quit-application-menu-item.injectable.ts
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
+import stopServicesAndExitAppInjectable from "../../../../../../main/stop-services-and-exit-app.injectable";
+import isMacInjectable from "../../../../../../common/vars/is-mac.injectable";
+
+const quitApplicationMenuItemInjectable = getInjectable({
+  id: "quit-application-menu-item",
+
+  instantiate: (di) => {
+    const stopServicesAndExitApp = di.inject(stopServicesAndExitAppInjectable);
+    const isMac = di.inject(isMacInjectable);
+
+    return {
+      kind: "clickable-menu-item" as const,
+      id: "quit",
+      label: "Quit",
+
+      parentId: isMac ? "mac" : "file",
+      orderNumber: isMac ? 140 : 70,
+      keyboardShortcut: isMac ? "Cmd+Q" : "Alt+F4",
+
+      onClick: () => {
+        stopServicesAndExitApp();
+      },
+    };
+  },
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default quitApplicationMenuItemInjectable;
diff --git a/src/features/application-menu/main/menu-items/special-menu-for-mac-application/separators/separators.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/separators/separators.injectable.ts
new file mode 100644
index 0000000000..e878df9210
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/separators/separators.injectable.ts
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import {
+  getApplicationMenuSeparatorInjectable,
+} from "../../get-application-menu-separator-injectable";
+
+export const separator1 = getApplicationMenuSeparatorInjectable({
+  id: "separator-1",
+  parentId: "mac",
+  orderNumber: 30,
+});
+
+export const separator2 = getApplicationMenuSeparatorInjectable({
+  id: "separator-2",
+  parentId: "mac",
+  orderNumber: 70,
+});
+
+export const separator3 = getApplicationMenuSeparatorInjectable({
+  id: "separator-3",
+  parentId: "mac",
+  orderNumber: 90,
+});
+
+export const separator4 = getApplicationMenuSeparatorInjectable({
+  id: "separator-4",
+  parentId: "mac",
+  orderNumber: 130,
+});
diff --git a/src/features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/about-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/about-menu-item.injectable.ts
new file mode 100644
index 0000000000..6e269a9e3a
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/about-menu-item.injectable.ts
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import productNameInjectable from "../../../../../../common/vars/product-name.injectable";
+import showAboutInjectable from "./show-about.injectable";
+import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
+import isMacInjectable from "../../../../../../common/vars/is-mac.injectable";
+
+const aboutMenuItemInjectable = getInjectable({
+  id: "about-menu-item",
+
+  instantiate: (di) => {
+    const productName = di.inject(productNameInjectable);
+    const showAbout = di.inject(showAboutInjectable);
+    const isMac = di.inject(isMacInjectable);
+
+    return {
+      kind: "clickable-menu-item" as const,
+      id: "about",
+      parentId: isMac ? "mac" : "help",
+      orderNumber: isMac ? 10 : 40,
+      label: `About ${productName}`,
+
+      onClick() {
+        showAbout();
+      },
+    };
+  },
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default aboutMenuItemInjectable;
diff --git a/src/features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/show-about.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/show-about.injectable.ts
new file mode 100644
index 0000000000..a91e2af337
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/show-about.injectable.ts
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import showMessagePopupInjectable from "../../../../../../main/electron-app/features/show-message-popup.injectable";
+import isWindowsInjectable from "../../../../../../common/vars/is-windows.injectable";
+import appNameInjectable from "../../../../../../common/vars/app-name.injectable";
+import productNameInjectable from "../../../../../../common/vars/product-name.injectable";
+import buildVersionInjectable from "../../../../../../main/vars/build-version/build-version.injectable";
+import extensionApiVersionInjectable from "../../../../../../common/vars/extension-api-version.injectable";
+import applicationCopyrightInjectable from "../../../../../../common/vars/application-copyright.injectable";
+
+const showAboutInjectable = getInjectable({
+  id: "show-about",
+
+  instantiate: (di) => {
+    const buildVersion = di.inject(buildVersionInjectable);
+    const extensionApiVersion = di.inject(extensionApiVersionInjectable);
+    const showMessagePopup = di.inject(showMessagePopupInjectable);
+    const isWindows = di.inject(isWindowsInjectable);
+    const appName = di.inject(appNameInjectable);
+    const productName = di.inject(productNameInjectable);
+    const applicationCopyright = di.inject(applicationCopyrightInjectable);
+
+    return () => {
+      const appInfo = [
+        `${appName}: ${buildVersion.get()}`,
+        `Extension API: ${extensionApiVersion}`,
+        `Electron: ${process.versions.electron}`,
+        `Chrome: ${process.versions.chrome}`,
+        `Node: ${process.versions.node}`,
+        applicationCopyright,
+      ];
+
+      showMessagePopup(
+        `${isWindows ? " ".repeat(2) : ""}${appName}`,
+        productName,
+        appInfo.join("\r\n"),
+      );
+    };
+  },
+});
+
+export default showAboutInjectable;
diff --git a/src/features/application-menu/main/menu-items/view/go-back/go-back-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/view/go-back/go-back-menu-item.injectable.ts
new file mode 100644
index 0000000000..42860bdc5c
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/view/go-back/go-back-menu-item.injectable.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
+import { webContents } from "electron";
+
+const goBackMenuItemInjectable = getInjectable({
+  id: "go-back-menu-item",
+
+  instantiate: () => ({
+    kind: "clickable-menu-item" as const,
+    parentId: "view",
+    id: "go-back",
+    orderNumber: 40,
+    label: "Back",
+    keyboardShortcut: "CmdOrCtrl+[",
+
+    onClick: () => {
+      webContents
+        .getAllWebContents()
+        .filter((wc) => wc.getType() === "window")
+        .forEach((wc) => wc.goBack());
+    },
+  }),
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default goBackMenuItemInjectable;
diff --git a/src/features/application-menu/main/menu-items/view/go-forward/go-forward-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/view/go-forward/go-forward-menu-item.injectable.ts
new file mode 100644
index 0000000000..e37b8d1cf7
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/view/go-forward/go-forward-menu-item.injectable.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
+import { webContents } from "electron";
+
+const goForwardMenuItemInjectable = getInjectable({
+  id: "go-forward-menu-item",
+
+  instantiate: () => ({
+    kind: "clickable-menu-item" as const,
+    parentId: "view",
+    id: "go-forward",
+    orderNumber: 50,
+    label: "Forward",
+    keyboardShortcut: "CmdOrCtrl+]",
+
+    onClick: () => {
+      webContents
+        .getAllWebContents()
+        .filter((wc) => wc.getType() === "window")
+        .forEach((wc) => wc.goForward());
+    },
+  }),
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default goForwardMenuItemInjectable;
diff --git a/src/features/application-menu/main/menu-items/view/navigate-to-catalog/navigate-to-catalog-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/view/navigate-to-catalog/navigate-to-catalog-menu-item.injectable.ts
new file mode 100644
index 0000000000..eb414fe1ec
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/view/navigate-to-catalog/navigate-to-catalog-menu-item.injectable.ts
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
+import navigateToCatalogInjectable from "../../../../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
+
+const navigateToCatalogMenuItemInjectable = getInjectable({
+  id: "navigate-to-catalog-menu-item",
+
+  instantiate: (di) => {
+    const navigateToCatalog = di.inject(navigateToCatalogInjectable);
+
+    return {
+      kind: "clickable-menu-item" as const,
+      parentId: "view",
+      id: "navigate-to-catalog",
+      orderNumber: 10,
+      label: "Catalog",
+      keyboardShortcut: "Shift+CmdOrCtrl+C",
+
+      onClick: () => {
+        navigateToCatalog();
+      },
+    };
+  },
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default navigateToCatalogMenuItemInjectable;
diff --git a/src/features/application-menu/main/menu-items/view/open-command-palette/open-command-palette-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/view/open-command-palette/open-command-palette-menu-item.injectable.ts
new file mode 100644
index 0000000000..ac0bd77bfc
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/view/open-command-palette/open-command-palette-menu-item.injectable.ts
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
+import broadcastMessageInjectable from "../../../../../../common/ipc/broadcast-message.injectable";
+
+const openCommandPaletteMenuItemInjectable = getInjectable({
+  id: "open-command-palette-menu-item",
+
+  instantiate: (di) => {
+    const broadcastMessage = di.inject(broadcastMessageInjectable);
+
+    return {
+      kind: "clickable-menu-item" as const,
+      parentId: "view",
+      id: "open-command-palette",
+      orderNumber: 20,
+      label: "Command Palette...",
+      keyboardShortcut: "Shift+CmdOrCtrl+P",
+
+      onClick(_m, _b, event) {
+        /**
+         * Don't broadcast unless it was triggered by menu iteration so that
+         * there aren't double events in renderer
+         *
+         * NOTE: this `?` is required because of a bug in playwright. https://github.com/microsoft/playwright/issues/10554
+         */
+        if (!event?.triggeredByAccelerator) {
+          broadcastMessage("command-palette:open");
+        }
+      },
+    };
+  },
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default openCommandPaletteMenuItemInjectable;
diff --git a/src/features/application-menu/main/menu-items/view/operation-system-actions/operation-system-actions.injectable.ts b/src/features/application-menu/main/menu-items/view/operation-system-actions/operation-system-actions.injectable.ts
new file mode 100644
index 0000000000..a7969d94f7
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/view/operation-system-actions/operation-system-actions.injectable.ts
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import {
+  getApplicationMenuOperationSystemActionInjectable,
+} from "../../get-application-menu-operation-system-action-injectable";
+
+export const actionForToggleDevTools = getApplicationMenuOperationSystemActionInjectable({
+  id: "toggle-dev-tools",
+  parentId: "view",
+  orderNumber: 70,
+  actionName: "toggleDevTools",
+});
+
+export const actionForResetZoom = getApplicationMenuOperationSystemActionInjectable({
+  id: "reset-zoom",
+  parentId: "view",
+  orderNumber: 90,
+  actionName: "resetZoom",
+});
+
+export const actionForZoomIn = getApplicationMenuOperationSystemActionInjectable({
+  id: "zoom-in",
+  parentId: "view",
+  orderNumber: 100,
+  actionName: "zoomIn",
+});
+
+export const actionForZoomOut = getApplicationMenuOperationSystemActionInjectable({
+  id: "zoom-out",
+  parentId: "view",
+  orderNumber: 110,
+  actionName: "zoomOut",
+});
+
+export const actionForToggleFullScreen = getApplicationMenuOperationSystemActionInjectable({
+  id: "toggle-full-screen",
+  parentId: "view",
+  orderNumber: 130,
+  actionName: "togglefullscreen",
+});
diff --git a/src/features/application-menu/main/menu-items/view/reload/reload-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/view/reload/reload-menu-item.injectable.ts
new file mode 100644
index 0000000000..683daf666a
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/view/reload/reload-menu-item.injectable.ts
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
+import reloadCurrentApplicationWindowInjectable from "../../../../../../main/start-main-application/lens-window/reload-current-application-window.injectable";
+
+const reloadMenuItemInjectable = getInjectable({
+  id: "reload-menu-item",
+
+  instantiate: (di) => {
+    const reloadApplicationWindow = di.inject(
+      reloadCurrentApplicationWindowInjectable,
+    );
+
+    return {
+      kind: "clickable-menu-item" as const,
+      parentId: "view",
+      id: "reload",
+      orderNumber: 60,
+      label: "Reload",
+      keyboardShortcut: "CmdOrCtrl+R",
+
+      onClick: () => {
+        reloadApplicationWindow();
+      },
+    };
+  },
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default reloadMenuItemInjectable;
diff --git a/src/features/application-menu/main/menu-items/view/separators/separators.injectable.ts b/src/features/application-menu/main/menu-items/view/separators/separators.injectable.ts
new file mode 100644
index 0000000000..00584ea384
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/view/separators/separators.injectable.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import {
+  getApplicationMenuSeparatorInjectable,
+} from "../../get-application-menu-separator-injectable";
+
+export const separator1 = getApplicationMenuSeparatorInjectable({
+  id: "separator-1-for-view",
+  parentId: "view",
+  orderNumber: 30,
+});
+
+export const separator2 = getApplicationMenuSeparatorInjectable({
+  id: "separator-2-for-view",
+  parentId: "view",
+  orderNumber: 80,
+});
+
+export const separator3 = getApplicationMenuSeparatorInjectable({
+  id: "separator-3-for-view",
+  parentId: "view",
+  orderNumber: 120,
+});
diff --git a/src/features/application-menu/main/menu-items/view/view-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/view/view-menu-item.injectable.ts
new file mode 100644
index 0000000000..f45fbf7ebc
--- /dev/null
+++ b/src/features/application-menu/main/menu-items/view/view-menu-item.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../application-menu-item-injection-token";
+
+const viewMenuItemInjectable = getInjectable({
+  id: "view-application-menu-item",
+
+  instantiate: () => ({
+    kind: "top-level-menu" as const,
+    parentId: "root" as const,
+    id: "view",
+    orderNumber: 40,
+    label: "View",
+  }),
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default viewMenuItemInjectable;
diff --git a/src/main/menu/menu-registration.ts b/src/features/application-menu/main/menu-registration.ts
similarity index 100%
rename from src/main/menu/menu-registration.ts
rename to src/features/application-menu/main/menu-registration.ts
diff --git a/src/features/application-menu/main/menu.ts b/src/features/application-menu/main/menu.ts
new file mode 100644
index 0000000000..2082a35ed8
--- /dev/null
+++ b/src/features/application-menu/main/menu.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { Menu } from "electron";
+import type { MenuItemOpts } from "./application-menu-items.injectable";
+
+export type MenuTopId = "mac" | "file" | "edit" | "view" | "help";
+
+export function buildMenu(applicationMenuItems: MenuItemOpts[]) {
+  Menu.setApplicationMenu(
+    Menu.buildFromTemplate(applicationMenuItems),
+  );
+}
diff --git a/src/features/application-menu/main/populate-application-menu.global-override-for-injectable.ts b/src/features/application-menu/main/populate-application-menu.global-override-for-injectable.ts
new file mode 100644
index 0000000000..acd4f5f14e
--- /dev/null
+++ b/src/features/application-menu/main/populate-application-menu.global-override-for-injectable.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import populateApplicationMenuInjectable from "./populate-application-menu.injectable";
+import { getGlobalOverride } from "../../../common/test-utils/get-global-override";
+
+export default getGlobalOverride(populateApplicationMenuInjectable, () => () => {});
diff --git a/src/features/application-menu/main/populate-application-menu.injectable.ts b/src/features/application-menu/main/populate-application-menu.injectable.ts
new file mode 100644
index 0000000000..8d744b4ded
--- /dev/null
+++ b/src/features/application-menu/main/populate-application-menu.injectable.ts
@@ -0,0 +1,110 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { Menu } from "electron";
+import type { MenuItemOpts } from "./application-menu-items.injectable";
+import type { Composite } from "../../../common/utils/composite/get-composite/get-composite";
+import type { ApplicationMenuItemTypes } from "./menu-items/application-menu-item-injection-token";
+import { pipeline } from "@ogre-tools/fp";
+import { map, sortBy } from "lodash/fp";
+import type { MenuItemRoot } from "./application-menu-item-composite.injectable";
+import { checkThatAllDiscriminablesAreExhausted } from "../../../common/utils/composable-responsibilities/discriminable/discriminable";
+
+const populateApplicationMenuInjectable = getInjectable({
+  id: "populate-application-menu",
+
+  instantiate:
+    () => (composite: Composite<ApplicationMenuItemTypes | MenuItemRoot>) => {
+      const electronTemplate = getApplicationMenuTemplate(composite);
+      const menu = Menu.buildFromTemplate(electronTemplate);
+
+      Menu.setApplicationMenu(menu);
+    },
+
+  causesSideEffects: true,
+});
+
+export default populateApplicationMenuInjectable;
+
+export const getApplicationMenuTemplate = (composite: Composite<ApplicationMenuItemTypes | MenuItemRoot>) => {
+  const topLevelMenus = composite.children.filter(
+    (x): x is Composite<ApplicationMenuItemTypes> => x.value.kind !== "root",
+  );
+
+  return topLevelMenus.map(toHierarchicalElectronMenuItem);
+};
+
+const toHierarchicalElectronMenuItem = (
+  composite: Composite<ApplicationMenuItemTypes>,
+): MenuItemOpts => {
+  const value = composite.value;
+
+  switch (value.kind) {
+    case "top-level-menu": {
+      const { id } = composite;
+      const { label, role } = value;
+
+      return {
+        ...(id ? { id } : {}),
+        ...(role ? { role } : {}),
+        label,
+
+        submenu: pipeline(
+          composite.children,
+          sortBy((childComposite) => childComposite.value.orderNumber),
+          map(toHierarchicalElectronMenuItem),
+        ),
+      };
+    }
+
+    case "sub-menu": {
+      const { id } = composite;
+      const { label } = value;
+
+      return {
+        ...(id ? { id } : {}),
+        label,
+
+        submenu: pipeline(
+          composite.children,
+          sortBy((childComposite) => childComposite.value.orderNumber),
+          map(toHierarchicalElectronMenuItem),
+        ),
+      };
+    }
+
+    case "clickable-menu-item": {
+      const { id } = composite;
+      const { label, onClick, keyboardShortcut } = value;
+
+      return {
+        ...(id ? { id } : {}),
+        ...(label ? { label } : {}),
+        ...(keyboardShortcut ? { accelerator: keyboardShortcut }: {}),
+        click: onClick,
+      };
+    }
+
+    case "os-action-menu-item": {
+      const { label, keyboardShortcut, actionName } = value;
+
+      return {
+        ...(label ? { label } : {}),
+        ...(keyboardShortcut ? { accelerator: keyboardShortcut } : {}),
+        role: actionName,
+      };
+    }
+
+    case "separator": {
+      return {
+        type: "separator",
+      };
+    }
+
+    default: {
+      throw checkThatAllDiscriminablesAreExhausted(value);
+    }
+  }
+};
diff --git a/src/main/menu/start-application-menu.injectable.ts b/src/features/application-menu/main/start-application-menu.injectable.ts
similarity index 64%
rename from src/main/menu/start-application-menu.injectable.ts
rename to src/features/application-menu/main/start-application-menu.injectable.ts
index b241137cec..77fb31cb2a 100644
--- a/src/main/menu/start-application-menu.injectable.ts
+++ b/src/features/application-menu/main/start-application-menu.injectable.ts
@@ -3,18 +3,19 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationMenuInjectable from "./application-menu.injectable";
-import { onLoadOfApplicationInjectionToken } from "../start-main-application/runnable-tokens/on-load-of-application-injection-token";
+import applicationMenuReactivityInjectable from "./application-menu-reactivity.injectable";
+import { onLoadOfApplicationInjectionToken } from "../../../main/start-main-application/runnable-tokens/on-load-of-application-injection-token";
 
 const startApplicationMenuInjectable = getInjectable({
   id: "start-application-menu",
 
   instantiate: (di) => {
     const applicationMenu = di.inject(
-      applicationMenuInjectable,
+      applicationMenuReactivityInjectable,
     );
 
     return {
+      id: "start-application-menu",
       run: async () => {
         await applicationMenu.start();
       },
diff --git a/src/main/menu/stop-application-menu.injectable.ts b/src/features/application-menu/main/stop-application-menu.injectable.ts
similarity index 53%
rename from src/main/menu/stop-application-menu.injectable.ts
rename to src/features/application-menu/main/stop-application-menu.injectable.ts
index 1492da32de..62abd439df 100644
--- a/src/main/menu/stop-application-menu.injectable.ts
+++ b/src/features/application-menu/main/stop-application-menu.injectable.ts
@@ -3,21 +3,18 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationMenuInjectable from "./application-menu.injectable";
-import { beforeQuitOfBackEndInjectionToken } from "../start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
+import applicationMenuReactivityInjectable from "./application-menu-reactivity.injectable";
+import { beforeQuitOfBackEndInjectionToken } from "../../../main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
 
 const stopApplicationMenuInjectable = getInjectable({
   id: "stop-application-menu",
 
   instantiate: (di) => {
-    const applicationMenu = di.inject(
-      applicationMenuInjectable,
-    );
+    const applicationMenu = di.inject(applicationMenuReactivityInjectable);
 
     return {
-      run: async () => {
-        await applicationMenu.stop();
-      },
+      id: "stop-application-menu",
+      run: () => void applicationMenu.stop(),
     };
   },
 
diff --git a/src/features/application-update/__snapshots__/installing-update.test.ts.snap b/src/features/application-update/__snapshots__/installing-update.test.ts.snap
index 394dc9c96c..395670cdda 100644
--- a/src/features/application-update/__snapshots__/installing-update.test.ts.snap
+++ b/src/features/application-update/__snapshots__/installing-update.test.ts.snap
@@ -12,44 +12,61 @@ exports[`installing update when started renders 1`] = `
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -78,7 +95,7 @@ exports[`installing update when started renders 1`] = `
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -184,6 +201,7 @@ exports[`installing update when started renders 1`] = `
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -214,44 +232,61 @@ exports[`installing update when started when user checks for updates renders 1`]
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -280,7 +315,7 @@ exports[`installing update when started when user checks for updates renders 1`]
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -386,6 +421,7 @@ exports[`installing update when started when user checks for updates renders 1`]
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -416,44 +452,61 @@ exports[`installing update when started when user checks for updates when new up
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -482,7 +535,7 @@ exports[`installing update when started when user checks for updates when new up
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -588,6 +641,7 @@ exports[`installing update when started when user checks for updates when new up
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -618,62 +672,86 @@ exports[`installing update when started when user checks for updates when new up
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
-            >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
-            >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
-            >
-              arrow_forward
-            </span>
-          </i>
-          <button
-            class="updateButton"
-            data-testid="update-button"
-            data-warning-level="light"
-            id="update-lens-button"
-          >
-            Update
             <i
-              class="Icon icon material focusable"
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
               <span
                 class="icon"
-                data-icon-name="arrow_drop_down"
+                data-icon-name="home"
               >
-                arrow_drop_down
+                home
               </span>
             </i>
-          </button>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <button
+              class="updateButton"
+              data-testid="update-button"
+              data-warning-level="light"
+              id="update-lens-button"
+            >
+              Update
+              <i
+                class="Icon icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="arrow_drop_down"
+                >
+                  arrow_drop_down
+                </span>
+              </i>
+            </button>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -702,7 +780,7 @@ exports[`installing update when started when user checks for updates when new up
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -808,6 +886,7 @@ exports[`installing update when started when user checks for updates when new up
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -838,62 +917,86 @@ exports[`installing update when started when user checks for updates when new up
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
-            >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
-            >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
-            >
-              arrow_forward
-            </span>
-          </i>
-          <button
-            class="updateButton"
-            data-testid="update-button"
-            data-warning-level="light"
-            id="update-lens-button"
-          >
-            Update
             <i
-              class="Icon icon material focusable"
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
               <span
                 class="icon"
-                data-icon-name="arrow_drop_down"
+                data-icon-name="home"
               >
-                arrow_drop_down
+                home
               </span>
             </i>
-          </button>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <button
+              class="updateButton"
+              data-testid="update-button"
+              data-warning-level="light"
+              id="update-lens-button"
+            >
+              Update
+              <i
+                class="Icon icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="arrow_drop_down"
+                >
+                  arrow_drop_down
+                </span>
+              </i>
+            </button>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -922,7 +1025,7 @@ exports[`installing update when started when user checks for updates when new up
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -1028,6 +1131,7 @@ exports[`installing update when started when user checks for updates when new up
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1058,44 +1162,61 @@ exports[`installing update when started when user checks for updates when no new
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1124,7 +1245,7 @@ exports[`installing update when started when user checks for updates when no new
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -1230,6 +1351,7 @@ exports[`installing update when started when user checks for updates when no new
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/application-update/analytics-for-installing-update.test.ts b/src/features/application-update/analytics-for-installing-update.test.ts
index 60523c5e49..2a7b8d19fd 100644
--- a/src/features/application-update/analytics-for-installing-update.test.ts
+++ b/src/features/application-update/analytics-for-installing-update.test.ts
@@ -5,21 +5,21 @@
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "../../main/application-update/publish-is-configured.injectable";
+import publishIsConfiguredInjectable from "./main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
-import type { CheckForPlatformUpdates } from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
-import checkForPlatformUpdatesInjectable from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
+import type { CheckForPlatformUpdates } from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
+import checkForPlatformUpdatesInjectable from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
 import appEventBusInjectable from "../../common/app-event-bus/app-event-bus.injectable";
 import type { DiContainer } from "@ogre-tools/injectable";
-import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable";
-import type { DownloadPlatformUpdate } from "../../main/application-update/download-platform-update/download-platform-update.injectable";
-import downloadPlatformUpdateInjectable from "../../main/application-update/download-platform-update/download-platform-update.injectable";
-import quitAndInstallUpdateInjectable from "../../main/application-update/quit-and-install-update.injectable";
-import appVersionInjectable from "../../common/vars/app-version.injectable";
-import periodicalCheckForUpdatesInjectable from "../../main/application-update/periodical-check-for-updates/periodical-check-for-updates.injectable";
+import processCheckingForUpdatesInjectable from "./main/process-checking-for-updates.injectable";
+import type { DownloadPlatformUpdate } from "./main/download-update/download-platform-update/download-platform-update.injectable";
+import downloadPlatformUpdateInjectable from "./main/download-update/download-platform-update/download-platform-update.injectable";
+import quitAndInstallUpdateInjectable from "./main/quit-and-install-update.injectable";
+import periodicalCheckForUpdatesInjectable from "./child-features/periodical-checking-of-updates/main/periodical-check-for-updates.injectable";
 import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time";
 import emitEventInjectable from "../../common/app-event-bus/emit-event.injectable";
+import getBuildVersionInjectable from "../../main/vars/build-version/get-build-version.injectable";
 
 describe("analytics for installing update", () => {
   let builder: ApplicationBuilder;
@@ -36,7 +36,7 @@ describe("analytics for installing update", () => {
     analyticsListenerMock = jest.fn();
 
     builder.beforeApplicationStart(mainDi => {
-      mainDi.override(appVersionInjectable, () => "42.0.0");
+      mainDi.override(getBuildVersionInjectable, () => () => "42.0.0");
 
       checkForPlatformUpdatesMock = asyncFn();
 
@@ -142,7 +142,7 @@ describe("analytics for installing update", () => {
     it("when checking for updates using application menu, sends event to analytics for being checked from application menu", async () => {
       analyticsListenerMock.mockClear();
 
-      builder.applicationMenu.click("root.check-for-updates");
+      builder.applicationMenu.click("root", "mac", "check-for-updates");
 
       expect(analyticsListenerMock.mock.calls).toEqual([
         [
diff --git a/src/features/application-update/child-features/application-update-using-application-menu/main/check-for-updates-menu-item.injectable.ts b/src/features/application-update/child-features/application-update-using-application-menu/main/check-for-updates-menu-item.injectable.ts
new file mode 100644
index 0000000000..fe997e62fb
--- /dev/null
+++ b/src/features/application-update/child-features/application-update-using-application-menu/main/check-for-updates-menu-item.injectable.ts
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+
+import applicationMenuItemInjectionToken from "../../../../application-menu/main/menu-items/application-menu-item-injection-token";
+import processCheckingForUpdatesInjectable from "../../../main/process-checking-for-updates.injectable";
+import showApplicationWindowInjectable from "../../../../../main/start-main-application/lens-window/show-application-window.injectable";
+import updatingIsEnabledInjectable from "../../../main/updating-is-enabled/updating-is-enabled.injectable";
+import isMacInjectable from "../../../../../common/vars/is-mac.injectable";
+
+const checkForUpdatesMenuItemInjectable = getInjectable({
+  id: "check-for-updates-menu-item",
+
+  instantiate: (di) => {
+    const processCheckingForUpdates = di.inject(
+      processCheckingForUpdatesInjectable,
+    );
+
+    const showApplicationWindow = di.inject(showApplicationWindowInjectable);
+
+    const updatingIsEnabled = di.inject(updatingIsEnabledInjectable);
+    const isMac = di.inject(isMacInjectable);
+
+    return {
+      kind: "clickable-menu-item" as const,
+      id: "check-for-updates",
+      parentId: isMac ? "mac" : "help",
+      orderNumber: isMac ? 20 : 50,
+      label: "Check for updates",
+      isShown: updatingIsEnabled,
+
+      onClick: () => {
+        // Todo: implement using async/await
+        processCheckingForUpdates("application-menu").then(() =>
+          showApplicationWindow(),
+        );
+      },
+    };
+  },
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default checkForUpdatesMenuItemInjectable;
diff --git a/src/features/application-update/__snapshots__/installing-update-using-topbar-button.test.tsx.snap b/src/features/application-update/child-features/application-update-using-top-bar/__snapshots__/installing-update-using-topbar-button.test.tsx.snap
similarity index 74%
rename from src/features/application-update/__snapshots__/installing-update-using-topbar-button.test.tsx.snap
rename to src/features/application-update/child-features/application-update-using-top-bar/__snapshots__/installing-update-using-topbar-button.test.tsx.snap
index ec1935b053..dab5bce6ef 100644
--- a/src/features/application-update/__snapshots__/installing-update-using-topbar-button.test.tsx.snap
+++ b/src/features/application-update/child-features/application-update-using-top-bar/__snapshots__/installing-update-using-topbar-button.test.tsx.snap
@@ -12,62 +12,86 @@ exports[`encourage user to update when sufficient time passed since update was d
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
-            >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
-            >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
-            >
-              arrow_forward
-            </span>
-          </i>
-          <button
-            class="updateButton"
-            data-testid="update-button"
-            data-warning-level="light"
-            id="update-lens-button"
-          >
-            Update
             <i
-              class="Icon icon material focusable"
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
               <span
                 class="icon"
-                data-icon-name="arrow_drop_down"
+                data-icon-name="home"
               >
-                arrow_drop_down
+                home
               </span>
             </i>
-          </button>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <button
+              class="updateButton"
+              data-testid="update-button"
+              data-warning-level="light"
+              id="update-lens-button"
+            >
+              Update
+              <i
+                class="Icon icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="arrow_drop_down"
+                >
+                  arrow_drop_down
+                </span>
+              </i>
+            </button>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -96,7 +120,7 @@ exports[`encourage user to update when sufficient time passed since update was d
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -202,6 +226,7 @@ exports[`encourage user to update when sufficient time passed since update was d
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -232,44 +257,61 @@ exports[`encourage user to update when sufficient time passed since update was d
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -298,7 +340,7 @@ exports[`encourage user to update when sufficient time passed since update was d
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -404,6 +446,7 @@ exports[`encourage user to update when sufficient time passed since update was d
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/application-update/installing-update-using-topbar-button.test.tsx b/src/features/application-update/child-features/application-update-using-top-bar/installing-update-using-topbar-button.test.tsx
similarity index 81%
rename from src/features/application-update/installing-update-using-topbar-button.test.tsx
rename to src/features/application-update/child-features/application-update-using-top-bar/installing-update-using-topbar-button.test.tsx
index 5e5500498b..88f59a720c 100644
--- a/src/features/application-update/installing-update-using-topbar-button.test.tsx
+++ b/src/features/application-update/child-features/application-update-using-top-bar/installing-update-using-topbar-button.test.tsx
@@ -6,17 +6,17 @@ import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import type { RenderResult } from "@testing-library/react";
 import { act } from "@testing-library/react";
-import type { CheckForPlatformUpdates } from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
-import checkForPlatformUpdatesInjectable from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
-import type { DownloadPlatformUpdate } from "../../main/application-update/download-platform-update/download-platform-update.injectable";
-import downloadPlatformUpdateInjectable from "../../main/application-update/download-platform-update/download-platform-update.injectable";
-import publishIsConfiguredInjectable from "../../main/application-update/publish-is-configured.injectable";
-import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable";
-import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable";
-import quitAndInstallUpdateInjectable from "../../main/application-update/quit-and-install-update.injectable";
-import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time";
+import type { CheckForPlatformUpdates } from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
+import checkForPlatformUpdatesInjectable from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
+import type { DownloadPlatformUpdate } from "../../main/download-update/download-platform-update/download-platform-update.injectable";
+import downloadPlatformUpdateInjectable from "../../main/download-update/download-platform-update/download-platform-update.injectable";
+import publishIsConfiguredInjectable from "../../main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable";
+import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable";
+import type { ApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
+import processCheckingForUpdatesInjectable from "../../main/process-checking-for-updates.injectable";
+import quitAndInstallUpdateInjectable from "../../main/quit-and-install-update.injectable";
+import { advanceFakeTime, useFakeTime } from "../../../../common/test-utils/use-fake-time";
 
 function daysToMilliseconds(days: number) {
   return Math.round(days * 24 * 60 * 60 * 1000);
diff --git a/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-application-top-bar-item/update-application-top-bar-item.injectable.ts b/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-application-top-bar-item/update-application-top-bar-item.injectable.ts
new file mode 100644
index 0000000000..0cbbcb89e5
--- /dev/null
+++ b/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-application-top-bar-item/update-application-top-bar-item.injectable.ts
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { topBarItemOnLeftSideInjectionToken } from "../../../../../../renderer/components/layout/top-bar/top-bar-items/top-bar-item-injection-token";
+import { UpdateButton } from "./update-button";
+import updateWarningLevelInjectable from "./update-warning-level.injectable";
+
+const updateApplicationTopBarItemInjectable = getInjectable({
+  id: "update-application-top-bar-item",
+
+  instantiate: (di) => {
+    const warningLevel = di.inject(updateWarningLevelInjectable);
+
+    return {
+      id: "update-application",
+      isShown: computed(() => !!warningLevel.get()),
+      orderNumber: 50,
+      Component: UpdateButton,
+    };
+  },
+
+  injectionToken: topBarItemOnLeftSideInjectionToken,
+});
+
+export default updateApplicationTopBarItemInjectable;
diff --git a/src/renderer/components/update-button/index.ts b/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-application-top-bar-item/update-button/index.ts
similarity index 100%
rename from src/renderer/components/update-button/index.ts
rename to src/features/application-update/child-features/application-update-using-top-bar/renderer/update-application-top-bar-item/update-button/index.ts
diff --git a/src/renderer/components/update-button/styles.module.scss b/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-application-top-bar-item/update-button/styles.module.scss
similarity index 100%
rename from src/renderer/components/update-button/styles.module.scss
rename to src/features/application-update/child-features/application-update-using-top-bar/renderer/update-application-top-bar-item/update-button/styles.module.scss
diff --git a/src/renderer/components/update-button/update-button.tsx b/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-application-top-bar-item/update-button/update-button.tsx
similarity index 80%
rename from src/renderer/components/update-button/update-button.tsx
rename to src/features/application-update/child-features/application-update-using-top-bar/renderer/update-application-top-bar-item/update-button/update-button.tsx
index 029b58f3fe..317e64936b 100644
--- a/src/renderer/components/update-button/update-button.tsx
+++ b/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-application-top-bar-item/update-button/update-button.tsx
@@ -7,15 +7,15 @@ import styles from "./styles.module.scss";
 
 import type { HTMLAttributes } from "react";
 import React, { useState } from "react";
-import { Menu, MenuItem } from "../menu";
-import { cssNames } from "../../utils";
-import type { IconProps } from "../icon";
-import { Icon } from "../icon";
+import { Menu, MenuItem } from "../../../../../../../renderer/components/menu";
+import { cssNames } from "../../../../../../../renderer/utils";
+import type { IconProps } from "../../../../../../../renderer/components/icon";
+import { Icon } from "../../../../../../../renderer/components/icon";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import { observer } from "mobx-react";
 import type { IComputedValue } from "mobx";
-import restartAndInstallUpdateInjectable from "./restart-and-install-update.injectable";
-import updateWarningLevelInjectable from "./update-warning-level.injectable";
+import restartAndInstallUpdateInjectable from "../../../../../renderer/restart-and-install-update.injectable";
+import updateWarningLevelInjectable from "../update-warning-level.injectable";
 
 interface UpdateButtonProps extends HTMLAttributes<HTMLButtonElement> {}
 
@@ -34,10 +34,6 @@ export const NonInjectedUpdateButton = observer(({ warningLevel, update, id }: U
     setOpened(!opened);
   };
 
-  if (!level) {
-    return null;
-  }
-
   return (
     <>
       <button
diff --git a/src/renderer/components/update-button/update-warning-level.injectable.ts b/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-application-top-bar-item/update-warning-level.injectable.ts
similarity index 82%
rename from src/renderer/components/update-button/update-warning-level.injectable.ts
rename to src/features/application-update/child-features/application-update-using-top-bar/renderer/update-application-top-bar-item/update-warning-level.injectable.ts
index cc963ab27d..b6890a206d 100644
--- a/src/renderer/components/update-button/update-warning-level.injectable.ts
+++ b/src/features/application-update/child-features/application-update-using-top-bar/renderer/update-application-top-bar-item/update-warning-level.injectable.ts
@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import updateDownloadedDateTimeInjectable from "../../../common/application-update/update-downloaded-date-time/update-downloaded-date-time.injectable";
-import { reactiveNow } from "../../../common/utils/reactive-now/reactive-now";
+import updateDownloadedDateTimeInjectable from "../../../../common/update-downloaded-date-time/update-downloaded-date-time.injectable";
+import { reactiveNow } from "../../../../../../common/utils/reactive-now/reactive-now";
 
 const updateWarningLevelInjectable = getInjectable({
   id: "update-warning-level",
diff --git a/src/features/application-update/__snapshots__/installing-update-using-tray.test.ts.snap b/src/features/application-update/child-features/application-update-using-tray/__snapshots__/installing-update-using-tray.test.ts.snap
similarity index 74%
rename from src/features/application-update/__snapshots__/installing-update-using-tray.test.ts.snap
rename to src/features/application-update/child-features/application-update-using-tray/__snapshots__/installing-update-using-tray.test.ts.snap
index fcb3eb4729..da6aa0ed80 100644
--- a/src/features/application-update/__snapshots__/installing-update-using-tray.test.ts.snap
+++ b/src/features/application-update/child-features/application-update-using-tray/__snapshots__/installing-update-using-tray.test.ts.snap
@@ -12,44 +12,61 @@ exports[`installing update using tray when started renders 1`] = `
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -78,7 +95,7 @@ exports[`installing update using tray when started renders 1`] = `
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -184,6 +201,7 @@ exports[`installing update using tray when started renders 1`] = `
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -214,44 +232,61 @@ exports[`installing update using tray when started when user checks for updates
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -280,7 +315,7 @@ exports[`installing update using tray when started when user checks for updates
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -386,6 +421,7 @@ exports[`installing update using tray when started when user checks for updates
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -416,44 +452,61 @@ exports[`installing update using tray when started when user checks for updates
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -482,7 +535,7 @@ exports[`installing update using tray when started when user checks for updates
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -588,6 +641,7 @@ exports[`installing update using tray when started when user checks for updates
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -618,62 +672,86 @@ exports[`installing update using tray when started when user checks for updates
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
-            >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
-            >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
-            >
-              arrow_forward
-            </span>
-          </i>
-          <button
-            class="updateButton"
-            data-testid="update-button"
-            data-warning-level="light"
-            id="update-lens-button"
-          >
-            Update
             <i
-              class="Icon icon material focusable"
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
               <span
                 class="icon"
-                data-icon-name="arrow_drop_down"
+                data-icon-name="home"
               >
-                arrow_drop_down
+                home
               </span>
             </i>
-          </button>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <button
+              class="updateButton"
+              data-testid="update-button"
+              data-warning-level="light"
+              id="update-lens-button"
+            >
+              Update
+              <i
+                class="Icon icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="arrow_drop_down"
+                >
+                  arrow_drop_down
+                </span>
+              </i>
+            </button>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -702,7 +780,7 @@ exports[`installing update using tray when started when user checks for updates
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -808,6 +886,7 @@ exports[`installing update using tray when started when user checks for updates
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -838,62 +917,86 @@ exports[`installing update using tray when started when user checks for updates
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
-            >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
-            >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
-            >
-              arrow_forward
-            </span>
-          </i>
-          <button
-            class="updateButton"
-            data-testid="update-button"
-            data-warning-level="light"
-            id="update-lens-button"
-          >
-            Update
             <i
-              class="Icon icon material focusable"
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
               <span
                 class="icon"
-                data-icon-name="arrow_drop_down"
+                data-icon-name="home"
               >
-                arrow_drop_down
+                home
               </span>
             </i>
-          </button>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <button
+              class="updateButton"
+              data-testid="update-button"
+              data-warning-level="light"
+              id="update-lens-button"
+            >
+              Update
+              <i
+                class="Icon icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="arrow_drop_down"
+                >
+                  arrow_drop_down
+                </span>
+              </i>
+            </button>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -922,7 +1025,7 @@ exports[`installing update using tray when started when user checks for updates
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -1028,6 +1131,7 @@ exports[`installing update using tray when started when user checks for updates
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1058,44 +1162,61 @@ exports[`installing update using tray when started when user checks for updates
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1124,7 +1245,7 @@ exports[`installing update using tray when started when user checks for updates
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -1230,6 +1351,7 @@ exports[`installing update using tray when started when user checks for updates
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/application-update/installing-update-using-tray.test.ts b/src/features/application-update/child-features/application-update-using-tray/installing-update-using-tray.test.ts
similarity index 86%
rename from src/features/application-update/installing-update-using-tray.test.ts
rename to src/features/application-update/child-features/application-update-using-tray/installing-update-using-tray.test.ts
index 9bcb140638..af38da12b7 100644
--- a/src/features/application-update/installing-update-using-tray.test.ts
+++ b/src/features/application-update/child-features/application-update-using-tray/installing-update-using-tray.test.ts
@@ -2,19 +2,19 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import type { ApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
 import type { RenderResult } from "@testing-library/react";
-import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "../../main/application-update/publish-is-configured.injectable";
-import type { CheckForPlatformUpdates } from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
-import checkForPlatformUpdatesInjectable from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
+import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable";
+import publishIsConfiguredInjectable from "../../main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable";
+import type { CheckForPlatformUpdates } from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
+import checkForPlatformUpdatesInjectable from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
-import type { DownloadPlatformUpdate } from "../../main/application-update/download-platform-update/download-platform-update.injectable";
-import downloadPlatformUpdateInjectable from "../../main/application-update/download-platform-update/download-platform-update.injectable";
-import type { LensWindow } from "../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
-import getCurrentApplicationWindowInjectable from "../../main/start-main-application/lens-window/application-window/get-current-application-window.injectable";
+import type { DownloadPlatformUpdate } from "../../main/download-update/download-platform-update/download-platform-update.injectable";
+import downloadPlatformUpdateInjectable from "../../main/download-update/download-platform-update/download-platform-update.injectable";
+import type { LensWindow } from "../../../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
+import getCurrentApplicationWindowInjectable from "../../../../main/start-main-application/lens-window/application-window/get-current-application-window.injectable";
 
 describe("installing update using tray", () => {
   let builder: ApplicationBuilder;
diff --git a/src/main/application-update/tray-icons/checking-for-updates-tray-icon.injectable.ts b/src/features/application-update/child-features/application-update-using-tray/main/tray-icons/checking-for-updates-tray-icon.injectable.ts
similarity index 66%
rename from src/main/application-update/tray-icons/checking-for-updates-tray-icon.injectable.ts
rename to src/features/application-update/child-features/application-update-using-tray/main/tray-icons/checking-for-updates-tray-icon.injectable.ts
index 5d22c98bba..c955199c21 100644
--- a/src/main/application-update/tray-icons/checking-for-updates-tray-icon.injectable.ts
+++ b/src/features/application-update/child-features/application-update-using-tray/main/tray-icons/checking-for-updates-tray-icon.injectable.ts
@@ -4,10 +4,10 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import getTrayIconPathInjectable from "../../tray/menu-icon/get-tray-icon-path.injectable";
-import { trayIconInjectionToken } from "../../tray/menu-icon/tray-icon-injection-token";
-import updatesAreBeingDiscoveredInjectable from "../../../common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable";
-import updateIsBeingDownloadedInjectable from "../../../common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable";
+import getTrayIconPathInjectable from "../../../../../../main/tray/menu-icon/get-tray-icon-path.injectable";
+import { trayIconInjectionToken } from "../../../../../../main/tray/menu-icon/tray-icon-injection-token";
+import updatesAreBeingDiscoveredInjectable from "../../../../common/updates-are-being-discovered/updates-are-being-discovered.injectable";
+import updateIsBeingDownloadedInjectable from "../../../../common/update-is-being-downloaded/update-is-being-downloaded.injectable";
 
 const checkingForUpdatesTrayIconInjectable = getInjectable({
   id: "checking-for-updates-tray-icon",
diff --git a/src/main/application-update/tray-icons/update-is-ready-to-be-installed-tray-icon.injectable.ts b/src/features/application-update/child-features/application-update-using-tray/main/tray-icons/update-is-ready-to-be-installed-tray-icon.injectable.ts
similarity index 79%
rename from src/main/application-update/tray-icons/update-is-ready-to-be-installed-tray-icon.injectable.ts
rename to src/features/application-update/child-features/application-update-using-tray/main/tray-icons/update-is-ready-to-be-installed-tray-icon.injectable.ts
index 7f097c0cbb..19d0495c38 100644
--- a/src/main/application-update/tray-icons/update-is-ready-to-be-installed-tray-icon.injectable.ts
+++ b/src/features/application-update/child-features/application-update-using-tray/main/tray-icons/update-is-ready-to-be-installed-tray-icon.injectable.ts
@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import getTrayIconPathInjectable from "../../tray/menu-icon/get-tray-icon-path.injectable";
-import { trayIconInjectionToken } from "../../tray/menu-icon/tray-icon-injection-token";
+import getTrayIconPathInjectable from "../../../../../../main/tray/menu-icon/get-tray-icon-path.injectable";
+import { trayIconInjectionToken } from "../../../../../../main/tray/menu-icon/tray-icon-injection-token";
 import updateIsReadyToBeInstalledInjectable from "../update-is-ready-to-be-installed.injectable";
 
 const updateIsReadyToBeInstalledTrayIconInjectable = getInjectable({
diff --git a/src/main/application-update/check-for-updates-tray-item.injectable.ts b/src/features/application-update/child-features/application-update-using-tray/main/tray-items/check-for-updates-tray-item.injectable.ts
similarity index 66%
rename from src/main/application-update/check-for-updates-tray-item.injectable.ts
rename to src/features/application-update/child-features/application-update-using-tray/main/tray-items/check-for-updates-tray-item.injectable.ts
index 82bdbfbbd4..e904abaa99 100644
--- a/src/main/application-update/check-for-updates-tray-item.injectable.ts
+++ b/src/features/application-update/child-features/application-update-using-tray/main/tray-items/check-for-updates-tray-item.injectable.ts
@@ -4,18 +4,18 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import updatingIsEnabledInjectable from "./updating-is-enabled.injectable";
-import { trayMenuItemInjectionToken } from "../tray/tray-menu-item/tray-menu-item-injection-token";
-import showApplicationWindowInjectable from "../start-main-application/lens-window/show-application-window.injectable";
-import discoveredUpdateVersionInjectable from "../../common/application-update/discovered-update-version/discovered-update-version.injectable";
-import updateIsBeingDownloadedInjectable from "../../common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable";
-import updatesAreBeingDiscoveredInjectable from "../../common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable";
-import progressOfUpdateDownloadInjectable from "../../common/application-update/progress-of-update-download/progress-of-update-download.injectable";
+import updatingIsEnabledInjectable from "../../../../main/updating-is-enabled/updating-is-enabled.injectable";
+import { trayMenuItemInjectionToken } from "../../../../../../main/tray/tray-menu-item/tray-menu-item-injection-token";
+import showApplicationWindowInjectable from "../../../../../../main/start-main-application/lens-window/show-application-window.injectable";
+import discoveredUpdateVersionInjectable from "../../../../common/discovered-update-version/discovered-update-version.injectable";
+import updateIsBeingDownloadedInjectable from "../../../../common/update-is-being-downloaded/update-is-being-downloaded.injectable";
+import updatesAreBeingDiscoveredInjectable from "../../../../common/updates-are-being-discovered/updates-are-being-discovered.injectable";
+import progressOfUpdateDownloadInjectable from "../../../../common/progress-of-update-download/progress-of-update-download.injectable";
 import assert from "assert";
-import processCheckingForUpdatesInjectable from "./check-for-updates/process-checking-for-updates.injectable";
-import { withErrorSuppression } from "../../common/utils/with-error-suppression/with-error-suppression";
+import processCheckingForUpdatesInjectable from "../../../../main/process-checking-for-updates.injectable";
+import { withErrorSuppression } from "../../../../../../common/utils/with-error-suppression/with-error-suppression";
 import { pipeline } from "@ogre-tools/fp";
-import withErrorLoggingInjectable from "../../common/utils/with-error-logging/with-error-logging.injectable";
+import withErrorLoggingInjectable from "../../../../../../common/utils/with-error-logging/with-error-logging.injectable";
 
 const checkForUpdatesTrayItemInjectable = getInjectable({
   id: "check-for-updates-tray-item",
diff --git a/src/main/application-update/install-application-update-tray-item.injectable.ts b/src/features/application-update/child-features/application-update-using-tray/main/tray-items/install-application-update-tray-item.injectable.ts
similarity index 68%
rename from src/main/application-update/install-application-update-tray-item.injectable.ts
rename to src/features/application-update/child-features/application-update-using-tray/main/tray-items/install-application-update-tray-item.injectable.ts
index ba71d5cfe7..86ae7d676f 100644
--- a/src/main/application-update/install-application-update-tray-item.injectable.ts
+++ b/src/features/application-update/child-features/application-update-using-tray/main/tray-items/install-application-update-tray-item.injectable.ts
@@ -4,13 +4,13 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { trayMenuItemInjectionToken } from "../tray/tray-menu-item/tray-menu-item-injection-token";
-import discoveredUpdateVersionInjectable from "../../common/application-update/discovered-update-version/discovered-update-version.injectable";
-import { withErrorSuppression } from "../../common/utils/with-error-suppression/with-error-suppression";
+import { trayMenuItemInjectionToken } from "../../../../../../main/tray/tray-menu-item/tray-menu-item-injection-token";
+import discoveredUpdateVersionInjectable from "../../../../common/discovered-update-version/discovered-update-version.injectable";
+import { withErrorSuppression } from "../../../../../../common/utils/with-error-suppression/with-error-suppression";
 import { pipeline } from "@ogre-tools/fp";
-import withErrorLoggingInjectable from "../../common/utils/with-error-logging/with-error-logging.injectable";
-import quitAndInstallUpdateInjectable from "./quit-and-install-update.injectable";
-import updateIsReadyToBeInstalledInjectable from "./update-is-ready-to-be-installed.injectable";
+import withErrorLoggingInjectable from "../../../../../../common/utils/with-error-logging/with-error-logging.injectable";
+import quitAndInstallUpdateInjectable from "../../../../main/quit-and-install-update.injectable";
+import updateIsReadyToBeInstalledInjectable from "../update-is-ready-to-be-installed.injectable";
 
 const installApplicationUpdateTrayItemInjectable = getInjectable({
   id: "install-update-tray-item",
diff --git a/src/main/application-update/update-is-ready-to-be-installed.injectable.ts b/src/features/application-update/child-features/application-update-using-tray/main/update-is-ready-to-be-installed.injectable.ts
similarity index 71%
rename from src/main/application-update/update-is-ready-to-be-installed.injectable.ts
rename to src/features/application-update/child-features/application-update-using-tray/main/update-is-ready-to-be-installed.injectable.ts
index 157d1bbd6c..39e23f51e6 100644
--- a/src/main/application-update/update-is-ready-to-be-installed.injectable.ts
+++ b/src/features/application-update/child-features/application-update-using-tray/main/update-is-ready-to-be-installed.injectable.ts
@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import discoveredUpdateVersionInjectable from "../../common/application-update/discovered-update-version/discovered-update-version.injectable";
-import updateIsBeingDownloadedInjectable from "../../common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable";
+import discoveredUpdateVersionInjectable from "../../../common/discovered-update-version/discovered-update-version.injectable";
+import updateIsBeingDownloadedInjectable from "../../../common/update-is-being-downloaded/update-is-being-downloaded.injectable";
 
 const updateIsReadyToBeInstalledInjectable = getInjectable({
   id: "update-is-ready-to-be-installed",
diff --git a/src/features/application-update/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap
similarity index 72%
rename from src/features/application-update/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap
rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap
index e6856ccc51..6ba121489b 100644
--- a/src/features/application-update/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap
+++ b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap
@@ -12,62 +12,86 @@ exports[`force user to update when too long since update was downloaded when app
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
-            >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
-            >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
-            >
-              arrow_forward
-            </span>
-          </i>
-          <button
-            class="updateButton"
-            data-testid="update-button"
-            data-warning-level="light"
-            id="update-lens-button"
-          >
-            Update
             <i
-              class="Icon icon material focusable"
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
               <span
                 class="icon"
-                data-icon-name="arrow_drop_down"
+                data-icon-name="home"
               >
-                arrow_drop_down
+                home
               </span>
             </i>
-          </button>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <button
+              class="updateButton"
+              data-testid="update-button"
+              data-warning-level="light"
+              id="update-lens-button"
+            >
+              Update
+              <i
+                class="Icon icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="arrow_drop_down"
+                >
+                  arrow_drop_down
+                </span>
+              </i>
+            </button>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -96,7 +120,7 @@ exports[`force user to update when too long since update was downloaded when app
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -202,6 +226,7 @@ exports[`force user to update when too long since update was downloaded when app
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -232,62 +257,86 @@ exports[`force user to update when too long since update was downloaded when app
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
-            >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
-            >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
-            >
-              arrow_forward
-            </span>
-          </i>
-          <button
-            class="updateButton"
-            data-testid="update-button"
-            data-warning-level="light"
-            id="update-lens-button"
-          >
-            Update
             <i
-              class="Icon icon material focusable"
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
               <span
                 class="icon"
-                data-icon-name="arrow_drop_down"
+                data-icon-name="home"
               >
-                arrow_drop_down
+                home
               </span>
             </i>
-          </button>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <button
+              class="updateButton"
+              data-testid="update-button"
+              data-warning-level="light"
+              id="update-lens-button"
+            >
+              Update
+              <i
+                class="Icon icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="arrow_drop_down"
+                >
+                  arrow_drop_down
+                </span>
+              </i>
+            </button>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -316,7 +365,7 @@ exports[`force user to update when too long since update was downloaded when app
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -422,6 +471,7 @@ exports[`force user to update when too long since update was downloaded when app
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -499,62 +549,86 @@ exports[`force user to update when too long since update was downloaded when app
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
-            >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
-            >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
-            >
-              arrow_forward
-            </span>
-          </i>
-          <button
-            class="updateButton"
-            data-testid="update-button"
-            data-warning-level="light"
-            id="update-lens-button"
-          >
-            Update
             <i
-              class="Icon icon material focusable"
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
               <span
                 class="icon"
-                data-icon-name="arrow_drop_down"
+                data-icon-name="home"
               >
-                arrow_drop_down
+                home
               </span>
             </i>
-          </button>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <button
+              class="updateButton"
+              data-testid="update-button"
+              data-warning-level="light"
+              id="update-lens-button"
+            >
+              Update
+              <i
+                class="Icon icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="arrow_drop_down"
+                >
+                  arrow_drop_down
+                </span>
+              </i>
+            </button>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -583,7 +657,7 @@ exports[`force user to update when too long since update was downloaded when app
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -689,6 +763,7 @@ exports[`force user to update when too long since update was downloaded when app
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/application-update/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts
similarity index 76%
rename from src/features/application-update/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts
rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts
index ba8380e7b5..b5a333d24e 100644
--- a/src/features/application-update/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts
+++ b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts
@@ -2,23 +2,23 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import type { CheckForPlatformUpdates } from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
-import checkForPlatformUpdatesInjectable from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
-import type { DownloadPlatformUpdate } from "../../main/application-update/download-platform-update/download-platform-update.injectable";
-import downloadPlatformUpdateInjectable from "../../main/application-update/download-platform-update/download-platform-update.injectable";
+import type { ApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
+import type { CheckForPlatformUpdates } from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
+import checkForPlatformUpdatesInjectable from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
+import type { DownloadPlatformUpdate } from "../../main/download-update/download-platform-update/download-platform-update.injectable";
+import downloadPlatformUpdateInjectable from "../../main/download-update/download-platform-update/download-platform-update.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import type { DiContainer } from "@ogre-tools/injectable";
-import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable";
+import processCheckingForUpdatesInjectable from "../../main/process-checking-for-updates.injectable";
 import type { RenderResult } from "@testing-library/react";
 import { fireEvent } from "@testing-library/react";
-import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time";
-import quitAndInstallUpdateInjectable from "../../main/application-update/quit-and-install-update.injectable";
-import timeAfterUpdateMustBeInstalledInjectable from "../../renderer/application-update/force-update-modal/time-after-update-must-be-installed.injectable";
-import secondsAfterInstallStartsInjectable from "../../renderer/application-update/force-update-modal/seconds-after-install-starts.injectable";
-import forceUpdateModalRootFrameComponentInjectable from "../../renderer/application-update/force-update-modal/force-update-modal-root-frame-component.injectable";
+import { advanceFakeTime, useFakeTime } from "../../../../common/test-utils/use-fake-time";
+import quitAndInstallUpdateInjectable from "../../main/quit-and-install-update.injectable";
+import timeAfterUpdateMustBeInstalledInjectable from "./renderer/force-update-modal/time-after-update-must-be-installed.injectable";
+import secondsAfterInstallStartsInjectable from "./renderer/force-update-modal/seconds-after-install-starts.injectable";
+import forceUpdateModalRootFrameComponentInjectable from "./renderer/force-update-modal/force-update-modal-root-frame-component.injectable";
 
 const TIME_AFTER_UPDATE_MUST_BE_INSTALLED = 1000;
 const TIME_AFTER_INSTALL_STARTS = 5 * 1000;
diff --git a/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal-root-frame-component.global-override-for-injectable.ts b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal-root-frame-component.global-override-for-injectable.ts
new file mode 100644
index 0000000000..49c4be5075
--- /dev/null
+++ b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal-root-frame-component.global-override-for-injectable.ts
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { computed } from "mobx";
+import { getGlobalOverride } from "../../../../../../common/test-utils/get-global-override";
+import forceUpdateModalRootFrameComponentInjectable from "./force-update-modal-root-frame-component.injectable";
+
+export default getGlobalOverride(
+  forceUpdateModalRootFrameComponentInjectable,
+
+  () => ({
+    id: "force-update-modal",
+    Component: () => null,
+    shouldRender: computed(() => false),
+  }),
+);
diff --git a/src/renderer/application-update/force-update-modal/force-update-modal-root-frame-component.injectable.ts b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal-root-frame-component.injectable.ts
similarity index 83%
rename from src/renderer/application-update/force-update-modal/force-update-modal-root-frame-component.injectable.ts
rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal-root-frame-component.injectable.ts
index 9681aa72e0..9109f4bfe3 100644
--- a/src/renderer/application-update/force-update-modal/force-update-modal-root-frame-component.injectable.ts
+++ b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal-root-frame-component.injectable.ts
@@ -4,10 +4,10 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { rootFrameChildComponentInjectionToken } from "../../frames/root-frame/root-frame-child-component-injection-token";
+import { rootFrameChildComponentInjectionToken } from "../../../../../../renderer/frames/root-frame/root-frame-child-component-injection-token";
 import { ForceUpdateModal } from "./force-update-modal";
 import timeSinceUpdateWasDownloadedInjectable from "./time-since-update-was-downloaded.injectable";
-import updateDownloadedDateTimeInjectable from "../../../common/application-update/update-downloaded-date-time/update-downloaded-date-time.injectable";
+import updateDownloadedDateTimeInjectable from "../../../../common/update-downloaded-date-time/update-downloaded-date-time.injectable";
 import timeAfterUpdateMustBeInstalledInjectable from "./time-after-update-must-be-installed.injectable";
 
 const forceUpdateModalRootFrameComponentInjectable = getInjectable({
diff --git a/src/renderer/application-update/force-update-modal/force-update-modal.module.scss b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal.module.scss
similarity index 100%
rename from src/renderer/application-update/force-update-modal/force-update-modal.module.scss
rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal.module.scss
diff --git a/src/renderer/application-update/force-update-modal/force-update-modal.tsx b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal.tsx
similarity index 84%
rename from src/renderer/application-update/force-update-modal/force-update-modal.tsx
rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal.tsx
index 22c322be82..83daa606e3 100644
--- a/src/renderer/application-update/force-update-modal/force-update-modal.tsx
+++ b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/force-update-modal.tsx
@@ -4,13 +4,13 @@
  */
 import { withInjectables } from "@ogre-tools/injectable-react";
 import React from "react";
-import restartAndInstallUpdateInjectable from "../../components/update-button/restart-and-install-update.injectable";
-import { Countdown } from "../../components/countdown/countdown";
+import restartAndInstallUpdateInjectable from "../../../../renderer/restart-and-install-update.injectable";
+import { Countdown } from "../../../../../../renderer/components/countdown/countdown";
 import type { IComputedValue } from "mobx";
 import { observer } from "mobx-react";
 import installUpdateCountdownInjectable from "./install-update-countdown.injectable";
-import { Dialog } from "../../components/dialog";
-import { Button } from "../../components/button";
+import { Dialog } from "../../../../../../renderer/components/dialog";
+import { Button } from "../../../../../../renderer/components/button";
 import styles from "./force-update-modal.module.scss";
 
 interface Dependencies {
diff --git a/src/renderer/application-update/force-update-modal/install-update-countdown.injectable.ts b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/install-update-countdown.injectable.ts
similarity index 78%
rename from src/renderer/application-update/force-update-modal/install-update-countdown.injectable.ts
rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/install-update-countdown.injectable.ts
index eb1ee53371..f8e99b9ac1 100644
--- a/src/renderer/application-update/force-update-modal/install-update-countdown.injectable.ts
+++ b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/install-update-countdown.injectable.ts
@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import countdownStateInjectable from "../../components/countdown/countdown-state.injectable";
+import countdownStateInjectable from "../../../../../../renderer/components/countdown/countdown-state.injectable";
 import secondsAfterInstallStartsInjectable from "./seconds-after-install-starts.injectable";
-import restartAndInstallUpdateInjectable from "../../components/update-button/restart-and-install-update.injectable";
+import restartAndInstallUpdateInjectable from "../../../../renderer/restart-and-install-update.injectable";
 
 const installUpdateCountdownInjectable = getInjectable({
   id: "install-update-countdown",
diff --git a/src/renderer/application-update/force-update-modal/seconds-after-install-starts.injectable.ts b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/seconds-after-install-starts.injectable.ts
similarity index 100%
rename from src/renderer/application-update/force-update-modal/seconds-after-install-starts.injectable.ts
rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/seconds-after-install-starts.injectable.ts
diff --git a/src/renderer/application-update/force-update-modal/time-after-update-must-be-installed.injectable.ts b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/time-after-update-must-be-installed.injectable.ts
similarity index 100%
rename from src/renderer/application-update/force-update-modal/time-after-update-must-be-installed.injectable.ts
rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/time-after-update-must-be-installed.injectable.ts
diff --git a/src/renderer/application-update/force-update-modal/time-since-update-was-downloaded.injectable.ts b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/time-since-update-was-downloaded.injectable.ts
similarity index 78%
rename from src/renderer/application-update/force-update-modal/time-since-update-was-downloaded.injectable.ts
rename to src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/time-since-update-was-downloaded.injectable.ts
index e89657a72c..8ac86c80ca 100644
--- a/src/renderer/application-update/force-update-modal/time-since-update-was-downloaded.injectable.ts
+++ b/src/features/application-update/child-features/force-user-to-update-when-too-long-time-since-update-was-downloaded/renderer/force-update-modal/time-since-update-was-downloaded.injectable.ts
@@ -6,8 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { computed } from "mobx";
 import moment from "moment";
-import updateDownloadedDateTimeInjectable from "../../../common/application-update/update-downloaded-date-time/update-downloaded-date-time.injectable";
-import { reactiveNow } from "../../../common/utils/reactive-now/reactive-now";
+import updateDownloadedDateTimeInjectable from "../../../../common/update-downloaded-date-time/update-downloaded-date-time.injectable";
+import { reactiveNow } from "../../../../../../common/utils/reactive-now/reactive-now";
 
 const timeSinceUpdateWasDownloadedInjectable = getInjectable({
   id: "time-since-update-was-downloaded",
diff --git a/src/features/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap b/src/features/application-update/child-features/periodical-checking-of-updates/__snapshots__/periodical-checking-of-updates.test.ts.snap
similarity index 76%
rename from src/features/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap
rename to src/features/application-update/child-features/periodical-checking-of-updates/__snapshots__/periodical-checking-of-updates.test.ts.snap
index faae797792..36e52e2d5f 100644
--- a/src/features/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap
+++ b/src/features/application-update/child-features/periodical-checking-of-updates/__snapshots__/periodical-checking-of-updates.test.ts.snap
@@ -12,44 +12,61 @@ exports[`periodical checking of updates given updater is enabled and configurati
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -78,7 +95,7 @@ exports[`periodical checking of updates given updater is enabled and configurati
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -184,6 +201,7 @@ exports[`periodical checking of updates given updater is enabled and configurati
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/application-update/child-features/periodical-checking-of-updates/main/periodical-check-for-updates.global-override-for-injectable.ts b/src/features/application-update/child-features/periodical-checking-of-updates/main/periodical-check-for-updates.global-override-for-injectable.ts
new file mode 100644
index 0000000000..6c255f8bc3
--- /dev/null
+++ b/src/features/application-update/child-features/periodical-checking-of-updates/main/periodical-check-for-updates.global-override-for-injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import periodicalCheckForUpdatesInjectable from "./periodical-check-for-updates.injectable";
+import { getGlobalOverride } from "../../../../../common/test-utils/get-global-override";
+
+export default getGlobalOverride(periodicalCheckForUpdatesInjectable, () => ({
+  start: async () => {},
+  stop: async () => {},
+  started: false,
+}));
diff --git a/src/main/application-update/periodical-check-for-updates/periodical-check-for-updates.injectable.ts b/src/features/application-update/child-features/periodical-checking-of-updates/main/periodical-check-for-updates.injectable.ts
similarity index 71%
rename from src/main/application-update/periodical-check-for-updates/periodical-check-for-updates.injectable.ts
rename to src/features/application-update/child-features/periodical-checking-of-updates/main/periodical-check-for-updates.injectable.ts
index b6b5f7b852..85c687e478 100644
--- a/src/main/application-update/periodical-check-for-updates/periodical-check-for-updates.injectable.ts
+++ b/src/features/application-update/child-features/periodical-checking-of-updates/main/periodical-check-for-updates.injectable.ts
@@ -3,9 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { getStartableStoppable } from "../../../common/utils/get-startable-stoppable";
-import processCheckingForUpdatesInjectable from "../check-for-updates/process-checking-for-updates.injectable";
-import withOrphanPromiseInjectable from "../../../common/utils/with-orphan-promise/with-orphan-promise.injectable";
+import { getStartableStoppable } from "../../../../../common/utils/get-startable-stoppable";
+import processCheckingForUpdatesInjectable from "../../../main/process-checking-for-updates.injectable";
+import withOrphanPromiseInjectable from "../../../../../common/utils/with-orphan-promise/with-orphan-promise.injectable";
+
+const TWO_HOURS = 1000 * 60 * 60 * 2;
 
 const periodicalCheckForUpdatesInjectable = getInjectable({
   id: "periodical-check-for-updates",
@@ -15,12 +17,9 @@ const periodicalCheckForUpdatesInjectable = getInjectable({
     const processCheckingForUpdates = withOrphanPromise(di.inject(processCheckingForUpdatesInjectable));
 
     return getStartableStoppable("periodical-check-for-updates", () => {
-      const TWO_HOURS = 1000 * 60 * 60 * 2;
-
       processCheckingForUpdates("periodic");
 
       const intervalId = setInterval(() => {
-
         processCheckingForUpdates("periodic");
       }, TWO_HOURS);
 
diff --git a/src/main/application-update/periodical-check-for-updates/start-checking-for-updates.injectable.ts b/src/features/application-update/child-features/periodical-checking-of-updates/main/start-checking-for-updates.injectable.ts
similarity index 73%
rename from src/main/application-update/periodical-check-for-updates/start-checking-for-updates.injectable.ts
rename to src/features/application-update/child-features/periodical-checking-of-updates/main/start-checking-for-updates.injectable.ts
index 347015b584..0292d148df 100644
--- a/src/main/application-update/periodical-check-for-updates/start-checking-for-updates.injectable.ts
+++ b/src/features/application-update/child-features/periodical-checking-of-updates/main/start-checking-for-updates.injectable.ts
@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import periodicalCheckForUpdatesInjectable from "./periodical-check-for-updates.injectable";
-import updatingIsEnabledInjectable from "../updating-is-enabled.injectable";
-import { afterApplicationIsLoadedInjectionToken } from "../../start-main-application/runnable-tokens/after-application-is-loaded-injection-token";
+import updatingIsEnabledInjectable from "../../../main/updating-is-enabled/updating-is-enabled.injectable";
+import { afterApplicationIsLoadedInjectionToken } from "../../../../../main/start-main-application/runnable-tokens/after-application-is-loaded-injection-token";
 
 const startCheckingForUpdatesInjectable = getInjectable({
   id: "start-checking-for-updates",
@@ -15,6 +15,7 @@ const startCheckingForUpdatesInjectable = getInjectable({
     const updatingIsEnabled = di.inject(updatingIsEnabledInjectable);
 
     return {
+      id: "start-checking-for-updates",
       run: async () => {
         if (updatingIsEnabled && !periodicalCheckForUpdates.started) {
           await periodicalCheckForUpdates.start();
diff --git a/src/main/application-update/periodical-check-for-updates/stop-checking-for-updates.injectable.ts b/src/features/application-update/child-features/periodical-checking-of-updates/main/stop-checking-for-updates.injectable.ts
similarity index 71%
rename from src/main/application-update/periodical-check-for-updates/stop-checking-for-updates.injectable.ts
rename to src/features/application-update/child-features/periodical-checking-of-updates/main/stop-checking-for-updates.injectable.ts
index 944642b674..6e58d7dd77 100644
--- a/src/main/application-update/periodical-check-for-updates/stop-checking-for-updates.injectable.ts
+++ b/src/features/application-update/child-features/periodical-checking-of-updates/main/stop-checking-for-updates.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import periodicalCheckForUpdatesInjectable from "./periodical-check-for-updates.injectable";
-import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
+import { beforeQuitOfBackEndInjectionToken } from "../../../../../main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
 
 const stopCheckingForUpdatesInjectable = getInjectable({
   id: "stop-checking-for-updates",
@@ -13,10 +13,13 @@ const stopCheckingForUpdatesInjectable = getInjectable({
     const periodicalCheckForUpdates = di.inject(periodicalCheckForUpdatesInjectable);
 
     return {
-      run: async () => {
+      id: "stop-checking-for-updates",
+      run: () => {
         if (periodicalCheckForUpdates.started) {
-          await periodicalCheckForUpdates.stop();
+          periodicalCheckForUpdates.stop();
         }
+
+        return undefined;
       },
     };
   },
diff --git a/src/features/application-update/periodical-checking-of-updates.test.ts b/src/features/application-update/child-features/periodical-checking-of-updates/periodical-checking-of-updates.test.ts
similarity index 80%
rename from src/features/application-update/periodical-checking-of-updates.test.ts
rename to src/features/application-update/child-features/periodical-checking-of-updates/periodical-checking-of-updates.test.ts
index e5c7b1c17c..e38ebdcbfc 100644
--- a/src/features/application-update/periodical-checking-of-updates.test.ts
+++ b/src/features/application-update/child-features/periodical-checking-of-updates/periodical-checking-of-updates.test.ts
@@ -2,14 +2,14 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import type { ApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
 import type { RenderResult } from "@testing-library/react";
-import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "../../main/application-update/publish-is-configured.injectable";
-import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable";
-import periodicalCheckForUpdatesInjectable from "../../main/application-update/periodical-check-for-updates/periodical-check-for-updates.injectable";
-import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time";
+import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable";
+import publishIsConfiguredInjectable from "../../main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable";
+import processCheckingForUpdatesInjectable from "../../main/process-checking-for-updates.injectable";
+import periodicalCheckForUpdatesInjectable from "./main/periodical-check-for-updates.injectable";
+import { advanceFakeTime, useFakeTime } from "../../../../common/test-utils/use-fake-time";
 
 const ENOUGH_TIME = 1000 * 60 * 60 * 2;
 
diff --git a/src/features/application-update/child-features/preferences/renderer/update-channel/update-channel-preference-block.injectable.ts b/src/features/application-update/child-features/preferences/renderer/update-channel/update-channel-preference-block.injectable.ts
new file mode 100644
index 0000000000..aa4fe3f5fb
--- /dev/null
+++ b/src/features/application-update/child-features/preferences/renderer/update-channel/update-channel-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../../../../preferences/renderer/preference-items/preference-item-injection-token";
+import { UpdateChannel } from "./update-channel";
+
+const updateChannelPreferenceBlockInjectable = getInjectable({
+  id: "update-channel-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "update-channel",
+    parentId: "application-page",
+    orderNumber: 50,
+    Component: UpdateChannel,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default updateChannelPreferenceBlockInjectable;
diff --git a/src/features/application-update/child-features/preferences/renderer/update-channel/update-channel.tsx b/src/features/application-update/child-features/preferences/renderer/update-channel/update-channel.tsx
new file mode 100644
index 0000000000..339d54beb8
--- /dev/null
+++ b/src/features/application-update/child-features/preferences/renderer/update-channel/update-channel.tsx
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import { Select } from "../../../../../../renderer/components/select";
+import { updateChannels } from "../../../../common/update-channels";
+import type { SelectedUpdateChannel } from "../../../../common/selected-update-channel/selected-update-channel.injectable";
+import selectedUpdateChannelInjectable from "../../../../common/selected-update-channel/selected-update-channel.injectable";
+import { pipeline } from "@ogre-tools/fp";
+import { map, toPairs } from "lodash/fp";
+import { observer } from "mobx-react";
+
+interface Dependencies {
+  selectedUpdateChannel: SelectedUpdateChannel;
+}
+
+const updateChannelOptions = pipeline(
+  toPairs(updateChannels),
+
+  map(([, channel]) => ({
+    value: channel.id,
+    label: channel.label,
+  })),
+);
+
+
+const NonInjectedUpdateChannel = observer(({ selectedUpdateChannel }: Dependencies) => (
+  <section id="update-channel">
+    <SubTitle title="Update Channel" />
+    <Select
+      id="update-channel-input"
+      options={updateChannelOptions}
+      value={selectedUpdateChannel.value.get().id}
+      onChange={(selected) => selectedUpdateChannel.setValue(selected?.value)}
+      themeName="lens"
+    />
+  </section>
+));
+
+export const UpdateChannel = withInjectables<Dependencies>(
+  NonInjectedUpdateChannel,
+
+  {
+    getProps: (di) => ({
+      selectedUpdateChannel: di.inject(selectedUpdateChannelInjectable),
+    }),
+  },
+);
diff --git a/src/features/application-update/__snapshots__/selection-of-update-stability.test.ts.snap b/src/features/application-update/child-features/selection-of-update-stability/__snapshots__/selection-of-update-stability.test.ts.snap
similarity index 76%
rename from src/features/application-update/__snapshots__/selection-of-update-stability.test.ts.snap
rename to src/features/application-update/child-features/selection-of-update-stability/__snapshots__/selection-of-update-stability.test.ts.snap
index a8629b21b6..253dedc1df 100644
--- a/src/features/application-update/__snapshots__/selection-of-update-stability.test.ts.snap
+++ b/src/features/application-update/child-features/selection-of-update-stability/__snapshots__/selection-of-update-stability.test.ts.snap
@@ -12,44 +12,61 @@ exports[`selection of update stability when started renders 1`] = `
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -78,7 +95,7 @@ exports[`selection of update stability when started renders 1`] = `
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -184,6 +201,7 @@ exports[`selection of update stability when started renders 1`] = `
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/application-update/selection-of-update-stability.test.ts b/src/features/application-update/child-features/selection-of-update-stability/selection-of-update-stability.test.ts
similarity index 73%
rename from src/features/application-update/selection-of-update-stability.test.ts
rename to src/features/application-update/child-features/selection-of-update-stability/selection-of-update-stability.test.ts
index 56937ab0b4..8e84d4d32f 100644
--- a/src/features/application-update/selection-of-update-stability.test.ts
+++ b/src/features/application-update/child-features/selection-of-update-stability/selection-of-update-stability.test.ts
@@ -2,27 +2,28 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import quitAndInstallUpdateInjectable from "../../main/application-update/quit-and-install-update.injectable";
+import type { ApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
+import quitAndInstallUpdateInjectable from "../../main/quit-and-install-update.injectable";
 import type { RenderResult } from "@testing-library/react";
-import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "../../main/application-update/publish-is-configured.injectable";
-import type { CheckForPlatformUpdates } from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
-import checkForPlatformUpdatesInjectable from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
+import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable";
+import publishIsConfiguredInjectable from "../../main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable";
+import type { CheckForPlatformUpdates } from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
+import checkForPlatformUpdatesInjectable from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
-import type { UpdateChannel, UpdateChannelId } from "../../common/application-update/update-channels";
-import { updateChannels } from "../../common/application-update/update-channels";
-import type { DownloadPlatformUpdate } from "../../main/application-update/download-platform-update/download-platform-update.injectable";
-import downloadPlatformUpdateInjectable from "../../main/application-update/download-platform-update/download-platform-update.injectable";
-import selectedUpdateChannelInjectable from "../../common/application-update/selected-update-channel/selected-update-channel.injectable";
+import type { UpdateChannel, ReleaseChannel } from "../../common/update-channels";
+import { updateChannels } from "../../common/update-channels";
+import type { DownloadPlatformUpdate } from "../../main/download-update/download-platform-update/download-platform-update.injectable";
+import downloadPlatformUpdateInjectable from "../../main/download-update/download-platform-update/download-platform-update.injectable";
+import selectedUpdateChannelInjectable from "../../common/selected-update-channel/selected-update-channel.injectable";
 import type { IComputedValue } from "mobx";
-import setUpdateOnQuitInjectable from "../../main/electron-app/features/set-update-on-quit.injectable";
-import showInfoNotificationInjectable from "../../renderer/components/notifications/show-info-notification.injectable";
-import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable";
-import appVersionInjectable from "../../common/vars/app-version.injectable";
+import setUpdateOnQuitInjectable from "../../../../main/electron-app/features/set-update-on-quit.injectable";
+import showInfoNotificationInjectable from "../../../../renderer/components/notifications/show-info-notification.injectable";
+import processCheckingForUpdatesInjectable from "../../main/process-checking-for-updates.injectable";
 import type { DiContainer } from "@ogre-tools/injectable";
+import getBuildVersionInjectable
+  from "../../../../main/vars/build-version/get-build-version.injectable";
 
 describe("selection of update stability", () => {
   let builder: ApplicationBuilder;
@@ -89,7 +90,7 @@ describe("selection of update stability", () => {
     describe('given update channel "alpha" is selected, when checking for updates', () => {
       let selectedUpdateChannel: {
         value: IComputedValue<UpdateChannel>;
-        setValue: (channelId: UpdateChannelId) => void;
+        setValue: (channelId: ReleaseChannel) => void;
       };
 
       beforeEach(() => {
@@ -105,7 +106,7 @@ describe("selection of update stability", () => {
       it('checks updates from update channel "alpha"', () => {
         expect(checkForPlatformUpdatesMock).toHaveBeenCalledWith(
           updateChannels.alpha,
-          { allowDowngrade: true },
+          { allowDowngrade: false },
         );
       });
 
@@ -132,7 +133,7 @@ describe("selection of update stability", () => {
         it('checks updates from update channel "beta"', () => {
           expect(checkForPlatformUpdatesMock).toHaveBeenCalledWith(
             updateChannels.beta,
-            { allowDowngrade: true },
+            { allowDowngrade: false },
           );
         });
 
@@ -159,7 +160,7 @@ describe("selection of update stability", () => {
           it('finally checks updates from update channel "latest"', () => {
             expect(checkForPlatformUpdatesMock).toHaveBeenCalledWith(
               updateChannels.latest,
-              { allowDowngrade: true },
+              { allowDowngrade: false },
             );
           });
 
@@ -180,7 +181,7 @@ describe("selection of update stability", () => {
     describe('given update channel "beta" is selected', () => {
       let selectedUpdateChannel: {
         value: IComputedValue<UpdateChannel>;
-        setValue: (channelId: UpdateChannelId) => void;
+        setValue: (channelId: ReleaseChannel) => void;
       };
 
       beforeEach(() => {
@@ -222,7 +223,7 @@ describe("selection of update stability", () => {
             it('given user changes update channel to "alpha", when user would close the application, installs the update for being stable enough', () => {
               selectedUpdateChannel.setValue(updateChannels.alpha.id);
 
-              expect(setUpdateOnQuitMock).toHaveBeenLastCalledWith(false);
+              expect(setUpdateOnQuitMock).toHaveBeenLastCalledWith(true);
             });
           });
         });
@@ -231,16 +232,12 @@ describe("selection of update stability", () => {
   });
 
   it("given valid update channel selection is stored, when checking for updates, checks for updates from the update channel", async () => {
-    builder.beforeApplicationStart((mainDi) => {
-      // TODO: Switch to more natural way of setting initial value
-      // TODO: UserStore is currently responsible for getting and setting initial value
-      const selectedUpdateChannel = mainDi.inject(selectedUpdateChannelInjectable);
-
-      selectedUpdateChannel.setValue(updateChannels.beta.id);
-    });
-
     await builder.render();
 
+    // TODO: Switch to more natural way of setting initial value
+    // TODO: UserStore is currently responsible for getting and setting initial value
+    mainDi.inject(selectedUpdateChannelInjectable).setValue(updateChannels.beta.id);
+
     const processCheckingForUpdates = mainDi.inject(processCheckingForUpdatesInjectable);
 
     processCheckingForUpdates("irrelevant");
@@ -249,16 +246,12 @@ describe("selection of update stability", () => {
   });
 
   it("given invalid update channel selection is stored, when checking for updates, checks for updates from the update channel", async () => {
-    builder.beforeApplicationStart((mainDi) => {
-      // TODO: Switch to more natural way of setting initial value
-      // TODO: UserStore is currently responsible for getting and setting initial value
-      const selectedUpdateChannel = mainDi.inject(selectedUpdateChannelInjectable);
-
-      selectedUpdateChannel.setValue("something-invalid" as UpdateChannelId);
-    });
-
     await builder.render();
 
+    // TODO: Switch to more natural way of setting initial value
+    // TODO: UserStore is currently responsible for getting and setting initial value
+    mainDi.inject(selectedUpdateChannelInjectable).setValue("something-invalid" as ReleaseChannel);
+
     const processCheckingForUpdates = mainDi.inject(processCheckingForUpdatesInjectable);
 
     processCheckingForUpdates("irrelevant");
@@ -268,7 +261,7 @@ describe("selection of update stability", () => {
 
   it('given no update channel selection is stored and currently using stable release, when user checks for updates, checks for updates from "latest" update channel by default', async () => {
     builder.beforeApplicationStart((mainDi) => {
-      mainDi.override(appVersionInjectable, () => "1.0.0");
+      mainDi.override(getBuildVersionInjectable, () => () => "1.0.0");
     });
 
     await builder.render();
@@ -279,13 +272,13 @@ describe("selection of update stability", () => {
 
     expect(checkForPlatformUpdatesMock).toHaveBeenCalledWith(
       updateChannels.latest,
-      { allowDowngrade: true },
+      { allowDowngrade: false },
     );
   });
 
   it('given no update channel selection is stored and currently using alpha release, when checking for updates, checks for updates from "alpha" channel', async () => {
     builder.beforeApplicationStart((mainDi) => {
-      mainDi.override(appVersionInjectable, () => "1.0.0-alpha");
+      mainDi.override(getBuildVersionInjectable, () => () => "1.0.0-alpha");
     });
 
     await builder.render();
@@ -299,7 +292,7 @@ describe("selection of update stability", () => {
 
   it('given no update channel selection is stored and currently using beta release, when checking for updates, checks for updates from "beta" channel', async () => {
     builder.beforeApplicationStart((mainDi) => {
-      mainDi.override(appVersionInjectable, () => "1.0.0-beta");
+      mainDi.override(getBuildVersionInjectable, () => () => "1.0.0-beta");
     });
 
     await builder.render();
@@ -312,18 +305,12 @@ describe("selection of update stability", () => {
   });
 
   it("given update channel selection is stored and currently using prerelease, when checking for updates, checks for updates from stored channel", async () => {
-    builder.beforeApplicationStart((mainDi) => {
-      mainDi.override(appVersionInjectable, () => "1.0.0-alpha");
-
-      // TODO: Switch to more natural way of setting initial value
-      // TODO: UserStore is currently responsible for getting and setting initial value
-      const selectedUpdateChannel = mainDi.inject(selectedUpdateChannelInjectable);
-
-      selectedUpdateChannel.setValue(updateChannels.beta.id);
-    });
-
     await builder.render();
 
+    // TODO: Switch to more natural way of setting initial value
+    // TODO: UserStore is currently responsible for getting and setting initial value
+    mainDi.inject(selectedUpdateChannelInjectable).setValue(updateChannels.beta.id);
+
     const processCheckingForUpdates = mainDi.inject(processCheckingForUpdatesInjectable);
 
     processCheckingForUpdates("irrelevant");
diff --git a/src/common/application-update/discovered-update-version/discovered-update-version.injectable.ts b/src/features/application-update/common/discovered-update-version/discovered-update-version.injectable.ts
similarity index 72%
rename from src/common/application-update/discovered-update-version/discovered-update-version.injectable.ts
rename to src/features/application-update/common/discovered-update-version/discovered-update-version.injectable.ts
index 29e89d3ea3..1aefbb2c97 100644
--- a/src/common/application-update/discovered-update-version/discovered-update-version.injectable.ts
+++ b/src/features/application-update/common/discovered-update-version/discovered-update-version.injectable.ts
@@ -3,10 +3,10 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import createSyncBoxInjectable from "../../utils/sync-box/create-sync-box.injectable";
+import createSyncBoxInjectable from "../../../../common/utils/sync-box/create-sync-box.injectable";
 import type { UpdateChannel } from "../update-channels";
-import type { SyncBox } from "../../utils/sync-box/sync-box-injection-token";
-import { syncBoxInjectionToken } from "../../utils/sync-box/sync-box-injection-token";
+import type { SyncBox } from "../../../../common/utils/sync-box/sync-box-injection-token";
+import { syncBoxInjectionToken } from "../../../../common/utils/sync-box/sync-box-injection-token";
 
 export type DiscoveredUpdateVersion = SyncBox<{ version: string; updateChannel: UpdateChannel } | null>;
 
diff --git a/src/common/application-update/progress-of-update-download/progress-of-update-download.injectable.ts b/src/features/application-update/common/progress-of-update-download/progress-of-update-download.injectable.ts
similarity index 71%
rename from src/common/application-update/progress-of-update-download/progress-of-update-download.injectable.ts
rename to src/features/application-update/common/progress-of-update-download/progress-of-update-download.injectable.ts
index cf7b0cf7e0..ff0d5dc021 100644
--- a/src/common/application-update/progress-of-update-download/progress-of-update-download.injectable.ts
+++ b/src/features/application-update/common/progress-of-update-download/progress-of-update-download.injectable.ts
@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import createSyncBoxInjectable from "../../utils/sync-box/create-sync-box.injectable";
-import type { SyncBox } from "../../utils/sync-box/sync-box-injection-token";
-import { syncBoxInjectionToken } from "../../utils/sync-box/sync-box-injection-token";
+import createSyncBoxInjectable from "../../../../common/utils/sync-box/create-sync-box.injectable";
+import type { SyncBox } from "../../../../common/utils/sync-box/sync-box-injection-token";
+import { syncBoxInjectionToken } from "../../../../common/utils/sync-box/sync-box-injection-token";
 
 export interface ProgressOfDownload {
   percentage: number;
diff --git a/src/features/application-update/common/restart-and-install-update-channel.ts b/src/features/application-update/common/restart-and-install-update-channel.ts
new file mode 100644
index 0000000000..470debf981
--- /dev/null
+++ b/src/features/application-update/common/restart-and-install-update-channel.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { MessageChannel } from "../../../common/utils/channel/message-channel-listener-injection-token";
+
+export type RestartAndInstallUpdateChannel = MessageChannel<void>;
+
+export const restartAndInstallUpdateChannel: RestartAndInstallUpdateChannel = {
+  id: "restart-and-install-update-channel",
+};
diff --git a/src/features/application-update/common/selected-update-channel/default-update-channel.injectable.ts b/src/features/application-update/common/selected-update-channel/default-update-channel.injectable.ts
new file mode 100644
index 0000000000..0be5adca42
--- /dev/null
+++ b/src/features/application-update/common/selected-update-channel/default-update-channel.injectable.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import releaseChannelInjectable from "../../../../common/vars/release-channel.injectable";
+import { updateChannels } from "../update-channels";
+import { createInitializableState } from "../../../../common/initializable-state/create";
+
+const defaultUpdateChannelInjectable = createInitializableState({
+  id: "default-update-channel",
+  init: (di) => updateChannels[di.inject(releaseChannelInjectable).get()],
+});
+
+export default defaultUpdateChannelInjectable;
diff --git a/src/common/application-update/selected-update-channel/selected-update-channel.injectable.ts b/src/features/application-update/common/selected-update-channel/selected-update-channel.injectable.ts
similarity index 76%
rename from src/common/application-update/selected-update-channel/selected-update-channel.injectable.ts
rename to src/features/application-update/common/selected-update-channel/selected-update-channel.injectable.ts
index ceb47aee5e..d11778b9bd 100644
--- a/src/common/application-update/selected-update-channel/selected-update-channel.injectable.ts
+++ b/src/features/application-update/common/selected-update-channel/selected-update-channel.injectable.ts
@@ -5,13 +5,13 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { IComputedValue } from "mobx";
 import { action, computed, observable } from "mobx";
-import type { UpdateChannel, UpdateChannelId } from "../update-channels";
+import type { UpdateChannel, ReleaseChannel } from "../update-channels";
 import { updateChannels } from "../update-channels";
 import defaultUpdateChannelInjectable from "./default-update-channel.injectable";
 
 export interface SelectedUpdateChannel {
   value: IComputedValue<UpdateChannel>;
-  setValue: (channelId?: UpdateChannelId) => void;
+  setValue: (channelId?: ReleaseChannel) => void;
 }
 
 const selectedUpdateChannelInjectable = getInjectable({
@@ -19,16 +19,16 @@ const selectedUpdateChannelInjectable = getInjectable({
 
   instantiate: (di): SelectedUpdateChannel => {
     const defaultUpdateChannel = di.inject(defaultUpdateChannelInjectable);
-    const state = observable.box(defaultUpdateChannel);
+    const state = observable.box<UpdateChannel>(undefined, { deep: false });
 
     return {
-      value: computed(() => state.get()),
+      value: computed(() => state.get() ?? defaultUpdateChannel.get()),
 
       setValue: action((channelId) => {
         const targetUpdateChannel =
           channelId && updateChannels[channelId]
             ? updateChannels[channelId]
-            : defaultUpdateChannel;
+            : defaultUpdateChannel.get();
 
         state.set(targetUpdateChannel);
       }),
diff --git a/src/common/application-update/update-channels.ts b/src/features/application-update/common/update-channels.ts
similarity index 80%
rename from src/common/application-update/update-channels.ts
rename to src/features/application-update/common/update-channels.ts
index dff1e5879e..1a38974946 100644
--- a/src/common/application-update/update-channels.ts
+++ b/src/features/application-update/common/update-channels.ts
@@ -4,7 +4,7 @@
  */
 
 
-export type UpdateChannelId = "alpha" | "beta" | "latest";
+export type ReleaseChannel = "alpha" | "beta" | "latest";
 
 const latestChannel: UpdateChannel = {
   id: "latest",
@@ -24,14 +24,14 @@ const alphaChannel: UpdateChannel = {
   moreStableUpdateChannel: betaChannel,
 };
 
-export const updateChannels: Record<UpdateChannelId, UpdateChannel> = {
+export const updateChannels = {
   latest: latestChannel,
   beta: betaChannel,
   alpha: alphaChannel,
 };
 
 export interface UpdateChannel {
-  readonly id: UpdateChannelId;
+  readonly id: ReleaseChannel;
   readonly label: string;
   readonly moreStableUpdateChannel: UpdateChannel | null;
 }
diff --git a/src/common/application-update/update-downloaded-date-time/update-downloaded-date-time.injectable.ts b/src/features/application-update/common/update-downloaded-date-time/update-downloaded-date-time.injectable.ts
similarity index 74%
rename from src/common/application-update/update-downloaded-date-time/update-downloaded-date-time.injectable.ts
rename to src/features/application-update/common/update-downloaded-date-time/update-downloaded-date-time.injectable.ts
index 32a15d310a..4caaa6654a 100644
--- a/src/common/application-update/update-downloaded-date-time/update-downloaded-date-time.injectable.ts
+++ b/src/features/application-update/common/update-downloaded-date-time/update-downloaded-date-time.injectable.ts
@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import createSyncBoxInjectable from "../../utils/sync-box/create-sync-box.injectable";
-import { syncBoxInjectionToken } from "../../utils/sync-box/sync-box-injection-token";
+import createSyncBoxInjectable from "../../../../common/utils/sync-box/create-sync-box.injectable";
+import { syncBoxInjectionToken } from "../../../../common/utils/sync-box/sync-box-injection-token";
 
 const updateDownloadedDateTimeInjectable = getInjectable({
   id: "update-downloaded-date-time",
diff --git a/src/common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable.ts b/src/features/application-update/common/update-is-being-downloaded/update-is-being-downloaded.injectable.ts
similarity index 67%
rename from src/common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable.ts
rename to src/features/application-update/common/update-is-being-downloaded/update-is-being-downloaded.injectable.ts
index 0eae5779ed..e10e5f5046 100644
--- a/src/common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable.ts
+++ b/src/features/application-update/common/update-is-being-downloaded/update-is-being-downloaded.injectable.ts
@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import createSyncBoxInjectable from "../../utils/sync-box/create-sync-box.injectable";
-import type { SyncBox } from "../../utils/sync-box/sync-box-injection-token";
-import { syncBoxInjectionToken } from "../../utils/sync-box/sync-box-injection-token";
+import createSyncBoxInjectable from "../../../../common/utils/sync-box/create-sync-box.injectable";
+import type { SyncBox } from "../../../../common/utils/sync-box/sync-box-injection-token";
+import { syncBoxInjectionToken } from "../../../../common/utils/sync-box/sync-box-injection-token";
 
 export type UpdateIsBeingDownloaded = SyncBox<boolean>;
 
diff --git a/src/common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable.ts b/src/features/application-update/common/updates-are-being-discovered/updates-are-being-discovered.injectable.ts
similarity index 68%
rename from src/common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable.ts
rename to src/features/application-update/common/updates-are-being-discovered/updates-are-being-discovered.injectable.ts
index 97ff920af4..d762771269 100644
--- a/src/common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable.ts
+++ b/src/features/application-update/common/updates-are-being-discovered/updates-are-being-discovered.injectable.ts
@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import createSyncBoxInjectable from "../../utils/sync-box/create-sync-box.injectable";
-import type { SyncBox } from "../../utils/sync-box/sync-box-injection-token";
-import { syncBoxInjectionToken } from "../../utils/sync-box/sync-box-injection-token";
+import createSyncBoxInjectable from "../../../../common/utils/sync-box/create-sync-box.injectable";
+import type { SyncBox } from "../../../../common/utils/sync-box/sync-box-injection-token";
+import { syncBoxInjectionToken } from "../../../../common/utils/sync-box/sync-box-injection-token";
 
 export type UpdatesAreBeingDiscovered = SyncBox<boolean>;
 
diff --git a/src/features/application-update/downgrading-version-update.test.ts b/src/features/application-update/downgrading-version-update.test.ts
index 0462bee3d4..69c6b5c6ff 100644
--- a/src/features/application-update/downgrading-version-update.test.ts
+++ b/src/features/application-update/downgrading-version-update.test.ts
@@ -5,16 +5,16 @@
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "../../main/application-update/publish-is-configured.injectable";
+import publishIsConfiguredInjectable from "./main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
-import type { CheckForPlatformUpdates } from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
-import checkForPlatformUpdatesInjectable from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
-import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable";
-import selectedUpdateChannelInjectable from "../../common/application-update/selected-update-channel/selected-update-channel.injectable";
+import type { CheckForPlatformUpdates } from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
+import checkForPlatformUpdatesInjectable from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
+import processCheckingForUpdatesInjectable from "./main/process-checking-for-updates.injectable";
+import selectedUpdateChannelInjectable from "./common/selected-update-channel/selected-update-channel.injectable";
 import type { DiContainer } from "@ogre-tools/injectable";
-import appVersionInjectable from "../../common/vars/app-version.injectable";
-import { updateChannels } from "../../common/application-update/update-channels";
+import { updateChannels } from "./common/update-channels";
+import getBuildVersionInjectable from "../../main/vars/build-version/get-build-version.injectable";
 
 describe("downgrading version update", () => {
   let applicationBuilder: ApplicationBuilder;
@@ -40,6 +40,36 @@ describe("downgrading version update", () => {
   });
 
   [
+    {
+      updateChannel: updateChannels.latest,
+      appVersion: "4.0.0",
+      downgradeIsAllowed: false,
+    },
+    {
+      updateChannel: updateChannels.beta,
+      appVersion: "4.0.0",
+      downgradeIsAllowed: false,
+    },
+    {
+      updateChannel: updateChannels.alpha,
+      appVersion: "4.0.0",
+      downgradeIsAllowed: false,
+    },
+    {
+      updateChannel: updateChannels.latest,
+      appVersion: "4.0.0-latest",
+      downgradeIsAllowed: false,
+    },
+    {
+      updateChannel: updateChannels.beta,
+      appVersion: "4.0.0-latest",
+      downgradeIsAllowed: false,
+    },
+    {
+      updateChannel: updateChannels.alpha,
+      appVersion: "4.0.0-latest",
+      downgradeIsAllowed: false,
+    },
     {
       updateChannel: updateChannels.latest,
       appVersion: "4.0.0-beta",
@@ -50,16 +80,21 @@ describe("downgrading version update", () => {
       appVersion: "4.0.0-beta",
       downgradeIsAllowed: false,
     },
-    {
-      updateChannel: updateChannels.beta,
-      appVersion: "4.0.0-beta.1",
-      downgradeIsAllowed: false,
-    },
     {
       updateChannel: updateChannels.alpha,
       appVersion: "4.0.0-beta",
+      downgradeIsAllowed: false,
+    },
+    {
+      updateChannel: updateChannels.latest,
+      appVersion: "4.0.0-alpha",
       downgradeIsAllowed: true,
     },
+    {
+      updateChannel: updateChannels.beta,
+      appVersion: "4.0.0-alpha",
+      downgradeIsAllowed: false,
+    },
     {
       updateChannel: updateChannels.alpha,
       appVersion: "4.0.0-alpha",
@@ -67,7 +102,7 @@ describe("downgrading version update", () => {
     },
   ].forEach(({ appVersion, updateChannel, downgradeIsAllowed }) => {
     it(`given application version "${appVersion}" and update channel "${updateChannel.id}", when checking for updates, can${downgradeIsAllowed ? "": "not"} downgrade`, async () => {
-      mainDi.override(appVersionInjectable, () => appVersion);
+      mainDi.override(getBuildVersionInjectable, () => () => appVersion);
 
       await applicationBuilder.render();
 
diff --git a/src/features/application-update/installing-update.test.ts b/src/features/application-update/installing-update.test.ts
index 7063fcfaa1..f6041c200e 100644
--- a/src/features/application-update/installing-update.test.ts
+++ b/src/features/application-update/installing-update.test.ts
@@ -4,18 +4,18 @@
  */
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import quitAndInstallUpdateInjectable from "../../main/application-update/quit-and-install-update.injectable";
+import quitAndInstallUpdateInjectable from "./main/quit-and-install-update.injectable";
 import type { RenderResult } from "@testing-library/react";
 import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "../../main/application-update/publish-is-configured.injectable";
-import type { CheckForPlatformUpdates } from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
-import checkForPlatformUpdatesInjectable from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
+import publishIsConfiguredInjectable from "./main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable";
+import type { CheckForPlatformUpdates } from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
+import checkForPlatformUpdatesInjectable from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
-import type { DownloadPlatformUpdate } from "../../main/application-update/download-platform-update/download-platform-update.injectable";
-import downloadPlatformUpdateInjectable from "../../main/application-update/download-platform-update/download-platform-update.injectable";
+import type { DownloadPlatformUpdate } from "./main/download-update/download-platform-update/download-platform-update.injectable";
+import downloadPlatformUpdateInjectable from "./main/download-update/download-platform-update/download-platform-update.injectable";
 import setUpdateOnQuitInjectable from "../../main/electron-app/features/set-update-on-quit.injectable";
-import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable";
+import processCheckingForUpdatesInjectable from "./main/process-checking-for-updates.injectable";
 import { useFakeTime } from "../../common/test-utils/use-fake-time";
 import staticFilesDirectoryInjectable from "../../common/vars/static-files-directory.injectable";
 
@@ -91,7 +91,7 @@ describe("installing update", () => {
       it("checks for updates", () => {
         expect(checkForPlatformUpdatesMock).toHaveBeenCalledWith(
           expect.any(Object),
-          { allowDowngrade: true },
+          { allowDowngrade: false },
         );
       });
 
diff --git a/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.global-override-for-injectable.ts b/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.global-override-for-injectable.ts
new file mode 100644
index 0000000000..5e271eaa30
--- /dev/null
+++ b/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.global-override-for-injectable.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import checkForPlatformUpdatesInjectable from "./check-for-platform-updates.injectable";
+import { getGlobalOverrideForFunction } from "../../../../../common/test-utils/get-global-override-for-function";
+
+export default getGlobalOverrideForFunction(checkForPlatformUpdatesInjectable);
diff --git a/src/main/application-update/check-for-platform-updates/check-for-platform-updates.injectable.ts b/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable.ts
similarity index 86%
rename from src/main/application-update/check-for-platform-updates/check-for-platform-updates.injectable.ts
rename to src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable.ts
index 286999c484..22726467a9 100644
--- a/src/main/application-update/check-for-platform-updates/check-for-platform-updates.injectable.ts
+++ b/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable.ts
@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import electronUpdaterInjectable from "../../electron-app/features/electron-updater.injectable";
-import type { UpdateChannel } from "../../../common/application-update/update-channels";
-import loggerInjectable from "../../../common/logger.injectable";
+import electronUpdaterInjectable from "../../../../../main/electron-app/features/electron-updater.injectable";
+import type { UpdateChannel } from "../../../common/update-channels";
+import loggerInjectable from "../../../../../common/logger.injectable";
 import type { UpdateCheckResult } from "electron-updater";
 
 export type CheckForUpdatesResult = {
diff --git a/src/main/application-update/check-for-platform-updates/check-for-platform-updates.test.ts b/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.test.ts
similarity index 87%
rename from src/main/application-update/check-for-platform-updates/check-for-platform-updates.test.ts
rename to src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.test.ts
index b826a1a5a7..4d9e9d9b7b 100644
--- a/src/main/application-update/check-for-platform-updates/check-for-platform-updates.test.ts
+++ b/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.test.ts
@@ -2,17 +2,17 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getDiForUnitTesting } from "../../getDiForUnitTesting";
-import electronUpdaterInjectable from "../../electron-app/features/electron-updater.injectable";
+import { getDiForUnitTesting } from "../../../../../main/getDiForUnitTesting";
+import electronUpdaterInjectable from "../../../../../main/electron-app/features/electron-updater.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import type { AppUpdater, UpdateCheckResult } from "electron-updater";
 import type { CheckForPlatformUpdates } from "./check-for-platform-updates.injectable";
 import checkForPlatformUpdatesInjectable from "./check-for-platform-updates.injectable";
-import type { UpdateChannel, UpdateChannelId } from "../../../common/application-update/update-channels";
-import { getPromiseStatus } from "../../../common/test-utils/get-promise-status";
-import loggerInjectable from "../../../common/logger.injectable";
-import type { Logger } from "../../../common/logger";
+import type { UpdateChannel, ReleaseChannel } from "../../../common/update-channels";
+import { getPromiseStatus } from "../../../../../common/test-utils/get-promise-status";
+import loggerInjectable from "../../../../../common/logger.injectable";
+import type { Logger } from "../../../../../common/logger";
 
 describe("check-for-platform-updates", () => {
   let checkForPlatformUpdates: CheckForPlatformUpdates;
@@ -47,7 +47,7 @@ describe("check-for-platform-updates", () => {
 
     beforeEach(() => {
       const testUpdateChannel: UpdateChannel = {
-        id: "some-update-channel" as UpdateChannelId,
+        id: "some-update-channel" as ReleaseChannel,
         label: "Some update channel",
         moreStableUpdateChannel: null,
       };
diff --git a/src/main/application-update/check-for-updates/check-for-updates-starting-from-channel.injectable.ts b/src/features/application-update/main/check-for-updates/check-for-updates-starting-from-channel.injectable.ts
similarity index 82%
rename from src/main/application-update/check-for-updates/check-for-updates-starting-from-channel.injectable.ts
rename to src/features/application-update/main/check-for-updates/check-for-updates-starting-from-channel.injectable.ts
index caf695ff80..8bd8498654 100644
--- a/src/main/application-update/check-for-updates/check-for-updates-starting-from-channel.injectable.ts
+++ b/src/features/application-update/main/check-for-updates/check-for-updates-starting-from-channel.injectable.ts
@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type { UpdateChannel } from "../../../common/application-update/update-channels";
-import checkForPlatformUpdatesInjectable from "../check-for-platform-updates/check-for-platform-updates.injectable";
+import type { UpdateChannel } from "../../common/update-channels";
+import checkForPlatformUpdatesInjectable from "./check-for-platform-updates/check-for-platform-updates.injectable";
 import updateCanBeDowngradedInjectable from "./update-can-be-downgraded.injectable";
 
 export type CheckForUpdatesFromChannelResult = {
@@ -19,10 +19,7 @@ const checkForUpdatesStartingFromChannelInjectable = getInjectable({
   id: "check-for-updates-starting-from-channel",
 
   instantiate: (di) => {
-    const checkForPlatformUpdates = di.inject(
-      checkForPlatformUpdatesInjectable,
-    );
-
+    const checkForPlatformUpdates = di.inject(checkForPlatformUpdatesInjectable);
     const updateCanBeDowngraded = di.inject(updateCanBeDowngradedInjectable);
 
     const _recursiveCheck = async (
diff --git a/src/features/application-update/main/check-for-updates/update-can-be-downgraded.injectable.ts b/src/features/application-update/main/check-for-updates/update-can-be-downgraded.injectable.ts
new file mode 100644
index 0000000000..d5f27464be
--- /dev/null
+++ b/src/features/application-update/main/check-for-updates/update-can-be-downgraded.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import selectedUpdateChannelInjectable from "../../common/selected-update-channel/selected-update-channel.injectable";
+import releaseChannelInjectable from "../../../../common/vars/release-channel.injectable";
+
+const updateCanBeDowngradedInjectable = getInjectable({
+  id: "update-can-be-downgraded",
+
+  instantiate: (di) => {
+    const selectedUpdateChannel = di.inject(selectedUpdateChannelInjectable);
+    const releaseChannel = di.inject(releaseChannelInjectable);
+
+    return computed(() => (
+      selectedUpdateChannel.value.get().id === "latest"
+      && releaseChannel.get() !== "latest"
+    ));
+  },
+});
+
+export default updateCanBeDowngradedInjectable;
diff --git a/src/features/application-update/main/download-update/download-platform-update/download-platform-update.global-override-for-injectable.ts b/src/features/application-update/main/download-update/download-platform-update/download-platform-update.global-override-for-injectable.ts
new file mode 100644
index 0000000000..15df5d835b
--- /dev/null
+++ b/src/features/application-update/main/download-update/download-platform-update/download-platform-update.global-override-for-injectable.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getGlobalOverrideForFunction } from "../../../../../common/test-utils/get-global-override-for-function";
+import downloadPlatformUpdateInjectable from "./download-platform-update.injectable";
+
+export default getGlobalOverrideForFunction(downloadPlatformUpdateInjectable);
diff --git a/src/main/application-update/download-platform-update/download-platform-update.injectable.ts b/src/features/application-update/main/download-update/download-platform-update/download-platform-update.injectable.ts
similarity index 81%
rename from src/main/application-update/download-platform-update/download-platform-update.injectable.ts
rename to src/features/application-update/main/download-update/download-platform-update/download-platform-update.injectable.ts
index 374efd2caf..14c4d2b075 100644
--- a/src/main/application-update/download-platform-update/download-platform-update.injectable.ts
+++ b/src/features/application-update/main/download-update/download-platform-update/download-platform-update.injectable.ts
@@ -3,10 +3,10 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import electronUpdaterInjectable from "../../electron-app/features/electron-updater.injectable";
-import loggerInjectable from "../../../common/logger.injectable";
+import electronUpdaterInjectable from "../../../../../main/electron-app/features/electron-updater.injectable";
+import loggerInjectable from "../../../../../common/logger.injectable";
 import type { ProgressInfo } from "electron-updater";
-import type { ProgressOfDownload } from "../../../common/application-update/progress-of-update-download/progress-of-update-download.injectable";
+import type { ProgressOfDownload } from "../../../common/progress-of-update-download/progress-of-update-download.injectable";
 
 export type DownloadPlatformUpdate = (
   onDownloadProgress: (arg: ProgressOfDownload) => void
diff --git a/src/main/application-update/download-platform-update/download-platform-update.test.ts b/src/features/application-update/main/download-update/download-platform-update/download-platform-update.test.ts
similarity index 91%
rename from src/main/application-update/download-platform-update/download-platform-update.test.ts
rename to src/features/application-update/main/download-update/download-platform-update/download-platform-update.test.ts
index 04507be980..d60b4eb897 100644
--- a/src/main/application-update/download-platform-update/download-platform-update.test.ts
+++ b/src/features/application-update/main/download-update/download-platform-update/download-platform-update.test.ts
@@ -2,17 +2,17 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getDiForUnitTesting } from "../../getDiForUnitTesting";
-import electronUpdaterInjectable from "../../electron-app/features/electron-updater.injectable";
+import { getDiForUnitTesting } from "../../../../../main/getDiForUnitTesting";
+import electronUpdaterInjectable from "../../../../../main/electron-app/features/electron-updater.injectable";
 import type { DownloadPlatformUpdate } from "./download-platform-update.injectable";
 import downloadPlatformUpdateInjectable from "./download-platform-update.injectable";
 import type { AppUpdater } from "electron-updater";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
-import { getPromiseStatus } from "../../../common/test-utils/get-promise-status";
+import { getPromiseStatus } from "../../../../../common/test-utils/get-promise-status";
 import type { DiContainer } from "@ogre-tools/injectable";
-import loggerInjectable from "../../../common/logger.injectable";
-import type { Logger } from "../../../common/logger";
+import loggerInjectable from "../../../../../common/logger.injectable";
+import type { Logger } from "../../../../../common/logger";
 
 describe("download-platform-update", () => {
   let downloadPlatformUpdate: DownloadPlatformUpdate;
diff --git a/src/main/application-update/download-update/download-update.injectable.ts b/src/features/application-update/main/download-update/download-update.injectable.ts
similarity index 63%
rename from src/main/application-update/download-update/download-update.injectable.ts
rename to src/features/application-update/main/download-update/download-update.injectable.ts
index 4def3b493a..e9019dc7b2 100644
--- a/src/main/application-update/download-update/download-update.injectable.ts
+++ b/src/features/application-update/main/download-update/download-update.injectable.ts
@@ -3,14 +3,14 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import downloadPlatformUpdateInjectable from "../download-platform-update/download-platform-update.injectable";
-import updateIsBeingDownloadedInjectable from "../../../common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable";
-import discoveredUpdateVersionInjectable from "../../../common/application-update/discovered-update-version/discovered-update-version.injectable";
+import downloadPlatformUpdateInjectable from "./download-platform-update/download-platform-update.injectable";
+import updateIsBeingDownloadedInjectable from "../../common/update-is-being-downloaded/update-is-being-downloaded.injectable";
+import discoveredUpdateVersionInjectable from "../../common/discovered-update-version/discovered-update-version.injectable";
 import { action, runInAction } from "mobx";
-import type { ProgressOfDownload } from "../../../common/application-update/progress-of-update-download/progress-of-update-download.injectable";
-import progressOfUpdateDownloadInjectable from "../../../common/application-update/progress-of-update-download/progress-of-update-download.injectable";
-import { getCurrentDateTime } from "../../../common/utils/date/get-current-date-time";
-import updateDownloadedDateTimeInjectable from "../../../common/application-update/update-downloaded-date-time/update-downloaded-date-time.injectable";
+import type { ProgressOfDownload } from "../../common/progress-of-update-download/progress-of-update-download.injectable";
+import progressOfUpdateDownloadInjectable from "../../common/progress-of-update-download/progress-of-update-download.injectable";
+import { getCurrentDateTime } from "../../../../common/utils/date/get-current-date-time";
+import updateDownloadedDateTimeInjectable from "../../common/update-downloaded-date-time/update-downloaded-date-time.injectable";
 
 const downloadUpdateInjectable = getInjectable({
   id: "download-update",
diff --git a/src/main/application-update/emit-current-version-to-analytics.injectable.ts b/src/features/application-update/main/emit-current-version-to-analytics.injectable.ts
similarity index 50%
rename from src/main/application-update/emit-current-version-to-analytics.injectable.ts
rename to src/features/application-update/main/emit-current-version-to-analytics.injectable.ts
index 7ec8d0b3b5..17fdf89944 100644
--- a/src/main/application-update/emit-current-version-to-analytics.injectable.ts
+++ b/src/features/application-update/main/emit-current-version-to-analytics.injectable.ts
@@ -3,26 +3,27 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { afterApplicationIsLoadedInjectionToken } from "../start-main-application/runnable-tokens/after-application-is-loaded-injection-token";
-import emitEventInjectable from "../../common/app-event-bus/emit-event.injectable";
-import { getCurrentDateTime } from "../../common/utils/date/get-current-date-time";
-import appVersionInjectable from "../../common/vars/app-version.injectable";
+import { afterApplicationIsLoadedInjectionToken } from "../../../main/start-main-application/runnable-tokens/after-application-is-loaded-injection-token";
+import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
+import { getCurrentDateTime } from "../../../common/utils/date/get-current-date-time";
+import buildVersionInjectable from "../../../main/vars/build-version/build-version.injectable";
 
 const emitCurrentVersionToAnalyticsInjectable = getInjectable({
   id: "emit-current-version-to-analytics",
 
   instantiate: (di) => {
-    const emitEvent = di.inject(emitEventInjectable);
-    const appVersion = di.inject(appVersionInjectable);
+    const emitAppEvent = di.inject(emitAppEventInjectable);
+    const buildVersion = di.inject(buildVersionInjectable);
 
     return {
+      id: "emit-current-version-to-analytics",
       run: () => {
-        emitEvent({
+        emitAppEvent({
           name: "app",
           action: "current-version",
 
           params: {
-            version: appVersion,
+            version: buildVersion.get(),
             currentDateTime: getCurrentDateTime(),
           },
         });
diff --git a/src/main/application-update/check-for-updates/process-checking-for-updates.injectable.ts b/src/features/application-update/main/process-checking-for-updates.injectable.ts
similarity index 77%
rename from src/main/application-update/check-for-updates/process-checking-for-updates.injectable.ts
rename to src/features/application-update/main/process-checking-for-updates.injectable.ts
index b669c6a2ea..40fde375f4 100644
--- a/src/main/application-update/check-for-updates/process-checking-for-updates.injectable.ts
+++ b/src/features/application-update/main/process-checking-for-updates.injectable.ts
@@ -3,13 +3,13 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import selectedUpdateChannelInjectable from "../../../common/application-update/selected-update-channel/selected-update-channel.injectable";
-import updatesAreBeingDiscoveredInjectable from "../../../common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable";
-import discoveredUpdateVersionInjectable from "../../../common/application-update/discovered-update-version/discovered-update-version.injectable";
+import selectedUpdateChannelInjectable from "../common/selected-update-channel/selected-update-channel.injectable";
+import updatesAreBeingDiscoveredInjectable from "../common/updates-are-being-discovered/updates-are-being-discovered.injectable";
+import discoveredUpdateVersionInjectable from "../common/discovered-update-version/discovered-update-version.injectable";
 import { runInAction } from "mobx";
-import downloadUpdateInjectable from "../download-update/download-update.injectable";
-import checkForUpdatesStartingFromChannelInjectable from "./check-for-updates-starting-from-channel.injectable";
-import emitEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
+import downloadUpdateInjectable from "./download-update/download-update.injectable";
+import checkForUpdatesStartingFromChannelInjectable from "./check-for-updates/check-for-updates-starting-from-channel.injectable";
+import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
 import { getCurrentDateTime } from "../../../common/utils/date/get-current-date-time";
 
 const processCheckingForUpdatesInjectable = getInjectable({
@@ -21,7 +21,7 @@ const processCheckingForUpdatesInjectable = getInjectable({
     const checkingForUpdatesState = di.inject(updatesAreBeingDiscoveredInjectable);
     const discoveredVersionState = di.inject(discoveredUpdateVersionInjectable);
     const checkForUpdatesStartingFromChannel = di.inject(checkForUpdatesStartingFromChannelInjectable);
-    const emitEvent = di.inject(emitEventInjectable);
+    const emitEvent = di.inject(emitAppEventInjectable);
 
     return async (source: string) => {
       emitEvent({
diff --git a/src/main/application-update/quit-and-install-update.injectable.ts b/src/features/application-update/main/quit-and-install-update.injectable.ts
similarity index 69%
rename from src/main/application-update/quit-and-install-update.injectable.ts
rename to src/features/application-update/main/quit-and-install-update.injectable.ts
index 0ba82feac2..3c31b0bcc2 100644
--- a/src/main/application-update/quit-and-install-update.injectable.ts
+++ b/src/features/application-update/main/quit-and-install-update.injectable.ts
@@ -3,10 +3,10 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import electronQuitAndInstallUpdateInjectable from "../electron-app/features/electron-quit-and-install-update.injectable";
-import { getCurrentDateTime } from "../../common/utils/date/get-current-date-time";
-import emitEventInjectable from "../../common/app-event-bus/emit-event.injectable";
-import discoveredUpdateVersionInjectable from "../../common/application-update/discovered-update-version/discovered-update-version.injectable";
+import electronQuitAndInstallUpdateInjectable from "../../../main/electron-app/features/electron-quit-and-install-update.injectable";
+import { getCurrentDateTime } from "../../../common/utils/date/get-current-date-time";
+import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
+import discoveredUpdateVersionInjectable from "../common/discovered-update-version/discovered-update-version.injectable";
 
 const quitAndInstallUpdateInjectable = getInjectable({
   id: "quit-and-install-update",
@@ -16,7 +16,7 @@ const quitAndInstallUpdateInjectable = getInjectable({
       electronQuitAndInstallUpdateInjectable,
     );
 
-    const emitEvent = di.inject(emitEventInjectable);
+    const emitEvent = di.inject(emitAppEventInjectable);
     const discoveredUpdateVersion = di.inject(discoveredUpdateVersionInjectable);
 
     return () => {
diff --git a/src/features/application-update/main/restart-and-install-update/restart-and-install-update-listener.injectable.ts b/src/features/application-update/main/restart-and-install-update/restart-and-install-update-listener.injectable.ts
new file mode 100644
index 0000000000..940856ad3b
--- /dev/null
+++ b/src/features/application-update/main/restart-and-install-update/restart-and-install-update-listener.injectable.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { restartAndInstallUpdateChannel } from "../../common/restart-and-install-update-channel";
+import { getMessageChannelListenerInjectable } from "../../../../common/utils/channel/message-channel-listener-injection-token";
+import quitAndInstallUpdateInjectable from "../quit-and-install-update.injectable";
+
+const restartAndInstallUpdateListenerInjectable = getMessageChannelListenerInjectable({
+  id: "restart",
+  channel: restartAndInstallUpdateChannel,
+  handler: (di) => di.inject(quitAndInstallUpdateInjectable),
+});
+
+export default restartAndInstallUpdateListenerInjectable;
diff --git a/src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.global-override-for-injectable.ts b/src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.global-override-for-injectable.ts
new file mode 100644
index 0000000000..f8c36953c6
--- /dev/null
+++ b/src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.global-override-for-injectable.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getGlobalOverride } from "../../../../../common/test-utils/get-global-override";
+import publishIsConfiguredInjectable from "./publish-is-configured.injectable";
+
+export default getGlobalOverride(publishIsConfiguredInjectable, () => false);
diff --git a/src/main/application-update/publish-is-configured.injectable.ts b/src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable.ts
similarity index 53%
rename from src/main/application-update/publish-is-configured.injectable.ts
rename to src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable.ts
index 321adc8a22..4e4b01ef84 100644
--- a/src/main/application-update/publish-is-configured.injectable.ts
+++ b/src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable.ts
@@ -3,18 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import packageJsonInjectable from "../../common/vars/package-json.injectable";
-import { has } from "lodash/fp";
+import applicationInformationInjectable from "../../../../../common/vars/application-information.injectable";
 
-// TOOO: Rename to something less technical
 const publishIsConfiguredInjectable = getInjectable({
   id: "publish-is-configured",
-
-  instantiate: (di) => {
-    const packageJson = di.inject(packageJsonInjectable);
-
-    return has("build.publish", packageJson);
-  },
+  instantiate: (di) => Boolean(di.inject(applicationInformationInjectable).build.publish?.length),
 });
 
 export default publishIsConfiguredInjectable;
diff --git a/src/main/application-update/updating-is-enabled.injectable.ts b/src/features/application-update/main/updating-is-enabled/updating-is-enabled.injectable.ts
similarity index 79%
rename from src/main/application-update/updating-is-enabled.injectable.ts
rename to src/features/application-update/main/updating-is-enabled/updating-is-enabled.injectable.ts
index df5e264219..0a9af398c0 100644
--- a/src/main/application-update/updating-is-enabled.injectable.ts
+++ b/src/features/application-update/main/updating-is-enabled/updating-is-enabled.injectable.ts
@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import electronUpdaterIsActiveInjectable from "../electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "./publish-is-configured.injectable";
+import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable";
+import publishIsConfiguredInjectable from "./publish-is-configured/publish-is-configured.injectable";
 
 const updatingIsEnabledInjectable = getInjectable({
   id: "updating-is-enabled",
diff --git a/src/main/application-update/watch-if-update-should-happen-on-quit/start-watching-if-update-should-happen-on-quit.injectable.ts b/src/features/application-update/main/watch-if-update-should-happen-on-quit/start-watching-if-update-should-happen-on-quit.injectable.ts
similarity index 79%
rename from src/main/application-update/watch-if-update-should-happen-on-quit/start-watching-if-update-should-happen-on-quit.injectable.ts
rename to src/features/application-update/main/watch-if-update-should-happen-on-quit/start-watching-if-update-should-happen-on-quit.injectable.ts
index ef31cf5db5..2609f8f46f 100644
--- a/src/main/application-update/watch-if-update-should-happen-on-quit/start-watching-if-update-should-happen-on-quit.injectable.ts
+++ b/src/features/application-update/main/watch-if-update-should-happen-on-quit/start-watching-if-update-should-happen-on-quit.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { onLoadOfApplicationInjectionToken } from "../../start-main-application/runnable-tokens/on-load-of-application-injection-token";
+import { onLoadOfApplicationInjectionToken } from "../../../../main/start-main-application/runnable-tokens/on-load-of-application-injection-token";
 import watchIfUpdateShouldHappenOnQuitInjectable from "./watch-if-update-should-happen-on-quit.injectable";
 
 const startWatchingIfUpdateShouldHappenOnQuitInjectable = getInjectable({
@@ -13,6 +13,7 @@ const startWatchingIfUpdateShouldHappenOnQuitInjectable = getInjectable({
     const watchIfUpdateShouldHappenOnQuit = di.inject(watchIfUpdateShouldHappenOnQuitInjectable);
 
     return {
+      id: "start-watching-if-update-should-happen-on-quit",
       run: () => {
         watchIfUpdateShouldHappenOnQuit.start();
       },
diff --git a/src/main/application-update/watch-if-update-should-happen-on-quit/stop-watching-if-update-should-happen-on-quit.injectable.ts b/src/features/application-update/main/watch-if-update-should-happen-on-quit/stop-watching-if-update-should-happen-on-quit.injectable.ts
similarity index 72%
rename from src/main/application-update/watch-if-update-should-happen-on-quit/stop-watching-if-update-should-happen-on-quit.injectable.ts
rename to src/features/application-update/main/watch-if-update-should-happen-on-quit/stop-watching-if-update-should-happen-on-quit.injectable.ts
index b66cf927f2..faf67b4ffc 100644
--- a/src/main/application-update/watch-if-update-should-happen-on-quit/stop-watching-if-update-should-happen-on-quit.injectable.ts
+++ b/src/features/application-update/main/watch-if-update-should-happen-on-quit/stop-watching-if-update-should-happen-on-quit.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import watchIfUpdateShouldHappenOnQuitInjectable from "./watch-if-update-should-happen-on-quit.injectable";
-import { beforeQuitOfBackEndInjectionToken } from "../../start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
+import { beforeQuitOfBackEndInjectionToken } from "../../../../main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
 
 const stopWatchingIfUpdateShouldHappenOnQuitInjectable = getInjectable({
   id: "stop-watching-if-update-should-happen-on-quit",
@@ -13,9 +13,8 @@ const stopWatchingIfUpdateShouldHappenOnQuitInjectable = getInjectable({
     const watchIfUpdateShouldHappenOnQuit = di.inject(watchIfUpdateShouldHappenOnQuitInjectable);
 
     return {
-      run: () => {
-        watchIfUpdateShouldHappenOnQuit.stop();
-      },
+      id: "stop-watching-if-update-should-happen-on-quit",
+      run: () => void watchIfUpdateShouldHappenOnQuit.stop(),
     };
   },
 
diff --git a/src/features/application-update/main/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts b/src/features/application-update/main/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts
new file mode 100644
index 0000000000..bcad45a0ac
--- /dev/null
+++ b/src/features/application-update/main/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { autorun } from "mobx";
+import { getStartableStoppable } from "../../../../common/utils/get-startable-stoppable";
+import setUpdateOnQuitInjectable from "../../../../main/electron-app/features/set-update-on-quit.injectable";
+import selectedUpdateChannelInjectable from "../../common/selected-update-channel/selected-update-channel.injectable";
+import type { ReleaseChannel, UpdateChannel } from "../../common/update-channels";
+import discoveredUpdateVersionInjectable from "../../common/discovered-update-version/discovered-update-version.injectable";
+
+const watchIfUpdateShouldHappenOnQuitInjectable = getInjectable({
+  id: "watch-if-update-should-happen-on-quit",
+
+  instantiate: (di) => {
+    const setUpdateOnQuit = di.inject(setUpdateOnQuitInjectable);
+    const selectedUpdateChannel = di.inject(selectedUpdateChannelInjectable);
+    const discoveredVersionState = di.inject(discoveredUpdateVersionInjectable);
+
+    return getStartableStoppable("watch-if-update-should-happen-on-quit", () =>
+      autorun(() => {
+        const sufficientlyStableUpdateChannels = getSufficientlyStableUpdateChannels(selectedUpdateChannel.value.get());
+        const updateIsDiscoveredFromChannel = discoveredVersionState.value.get()?.updateChannel;
+
+        setUpdateOnQuit((
+          updateIsDiscoveredFromChannel
+            ? sufficientlyStableUpdateChannels.includes(updateIsDiscoveredFromChannel.id)
+            : false
+        ));
+      }),
+    );
+  },
+});
+
+const getSufficientlyStableUpdateChannels = (updateChannel: UpdateChannel): ReleaseChannel[] => {
+  if (!updateChannel.moreStableUpdateChannel) {
+    return [updateChannel.id];
+  }
+
+  return [
+    updateChannel.id,
+    ...getSufficientlyStableUpdateChannels(updateChannel.moreStableUpdateChannel),
+  ];
+};
+
+export default watchIfUpdateShouldHappenOnQuitInjectable;
diff --git a/src/renderer/components/update-button/restart-and-install-update.injectable.ts b/src/features/application-update/renderer/restart-and-install-update.injectable.ts
similarity index 57%
rename from src/renderer/components/update-button/restart-and-install-update.injectable.ts
rename to src/features/application-update/renderer/restart-and-install-update.injectable.ts
index 854e0a428f..2502a599a2 100644
--- a/src/renderer/components/update-button/restart-and-install-update.injectable.ts
+++ b/src/features/application-update/renderer/restart-and-install-update.injectable.ts
@@ -3,18 +3,17 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import restartAndInstallUpdateChannel from "../../../common/application-update/restart-and-install-update-channel/restart-and-install-update-channel.injectable";
-import messageToChannelInjectable from "../../utils/channel/message-to-channel.injectable";
+import { restartAndInstallUpdateChannel } from "../common/restart-and-install-update-channel";
+import messageToChannelInjectable from "../../../renderer/utils/channel/message-to-channel.injectable";
 
 const restartAndInstallUpdateInjectable = getInjectable({
   id: "restart-and-install-update",
 
   instantiate: (di) => {
     const messageToChannel = di.inject(messageToChannelInjectable);
-    const channel = di.inject(restartAndInstallUpdateChannel);
 
     return () => {
-      messageToChannel(channel);
+      messageToChannel(restartAndInstallUpdateChannel);
     };
   },
 });
diff --git a/src/features/cluster/__snapshots__/legacy-extension-adding-cluster-frame-components.test.tsx.snap b/src/features/cluster/__snapshots__/legacy-extension-adding-cluster-frame-components.test.tsx.snap
new file mode 100644
index 0000000000..7d9748dcbd
--- /dev/null
+++ b/src/features/cluster/__snapshots__/legacy-extension-adding-cluster-frame-components.test.tsx.snap
@@ -0,0 +1,514 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`legacy extension adding cluster frame components given custom components for cluster view available renders 1`] = `
+<div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
+  >
+    <div
+      class="sidebar"
+    >
+      <div
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
+      >
+        <div
+          class="SidebarCluster"
+        >
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              aria-current="page"
+              class="navItem active"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span>
+                Workloads
+              </span>
+              <i
+                class="Icon expandIcon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="navItem"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span>
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="navItem"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span>
+                Network
+              </span>
+              <i
+                class="Icon expandIcon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="navItem"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span>
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="navItem"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span>
+                Helm
+              </span>
+              <i
+                class="Icon expandIcon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="navItem"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span>
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="navItem"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span>
+                Custom Resources
+              </span>
+              <i
+                class="Icon expandIcon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+        </div>
+      </div>
+      <div
+        class="ResizingAnchor horizontal trailing"
+      />
+    </div>
+    <div
+      class="contents"
+    >
+      <div
+        class="TabLayout"
+        data-testid="tab-layout"
+      >
+        <div
+          class="Tabs center scrollable"
+        >
+          <div
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-overview"
+            role="tab"
+            tabindex="0"
+          >
+            <div
+              class="label"
+            >
+              Overview
+            </div>
+          </div>
+        </div>
+        <main>
+          <div
+            class="WorkloadsOverview flex column gaps"
+            data-testid="page-for-workloads-overview"
+          >
+            <div
+              class="header flex gaps align-center"
+            >
+              <h5
+                class="box grow"
+              >
+                Overview
+              </h5>
+              <div
+                class="NamespaceSelectFilterParent"
+                data-testid="namespace-select-filter"
+              >
+                <div
+                  class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-overview-namespace-select-filter-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-overview-namespace-select-filter-input-placeholder"
+                      >
+                        All namespaces
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="overview-namespace-select-filter-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="OverviewStatuses"
+            >
+              <div
+                class="workloads"
+              />
+            </div>
+          </div>
+        </main>
+      </div>
+    </div>
+    <div
+      class="footer"
+    >
+      <div
+        class="Dock"
+        tabindex="-1"
+      >
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
+        >
+          <div
+            class="dockTabs"
+            role="tablist"
+          >
+            <div
+              class="Tabs tabs"
+            >
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                data-testid="dock-tab-for-terminal"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
+                        tabindex="0"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                      </i>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
+                        Close ⌘+W
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
+          >
+            <div
+              class="dock-menu box grow"
+            >
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu-actions-for-dock"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+              </i>
+              <div>
+                New tab
+              </div>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+            </i>
+            <div>
+              Fit to window
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+            </i>
+            <div>
+              Open
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div
+    data-testid="test-modal"
+  >
+    test modal
+  </div>
+</div>
+`;
diff --git a/src/features/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap b/src/features/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
index 7f76811494..8a293a41f9 100644
--- a/src/features/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
+++ b/src/features/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
@@ -484,6 +484,7 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -493,7 +494,9 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -1096,6 +1099,7 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -1105,7 +1109,9 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
diff --git a/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap b/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
index 49fcc917a4..6d64889cff 100644
--- a/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
+++ b/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
@@ -457,6 +457,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -466,7 +467,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -990,6 +993,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -999,7 +1003,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -1543,6 +1549,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -1552,7 +1559,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -1976,6 +1985,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -1985,7 +1995,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -2388,6 +2400,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -2397,7 +2410,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -2941,6 +2956,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -2950,7 +2966,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -3474,6 +3492,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -3483,7 +3502,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
diff --git a/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap b/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
index fff3da0126..ac415ae3e2 100644
--- a/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
+++ b/src/features/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
@@ -457,6 +457,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -466,7 +467,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -990,6 +993,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -999,7 +1003,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -1559,6 +1565,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -1568,7 +1575,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -2047,6 +2056,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -2056,7 +2066,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -2535,6 +2547,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -2544,7 +2557,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -2986,6 +3001,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -2995,7 +3011,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -3555,6 +3573,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -3564,7 +3583,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -4088,6 +4109,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -4097,7 +4119,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
diff --git a/src/features/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap b/src/features/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
index ed36d5134f..7fe8edf8cf 100644
--- a/src/features/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
+++ b/src/features/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
@@ -429,6 +429,7 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -438,7 +439,9 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -974,6 +977,7 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -983,7 +987,9 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
diff --git a/src/features/cluster/__snapshots__/workload-overview.test.tsx.snap b/src/features/cluster/__snapshots__/workload-overview.test.tsx.snap
index 6dbe47992f..e53ace250f 100644
--- a/src/features/cluster/__snapshots__/workload-overview.test.tsx.snap
+++ b/src/features/cluster/__snapshots__/workload-overview.test.tsx.snap
@@ -484,6 +484,7 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -493,7 +494,9 @@ exports[`workload overview when navigating to workload overview renders 1`] = `
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap b/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
new file mode 100644
index 0000000000..f6dff1fd8c
--- /dev/null
+++ b/src/features/cluster/delete-dialog/__snapshots__/delete-cluster-dialog.test.tsx.snap
@@ -0,0 +1,2287 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Deleting a cluster when an internal kubeconfig cluster is used when the dialog is opened renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="mainLayout"
+          style="--sidebar-width: 200px;"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="flex flex-col w-full"
+            >
+              <div
+                class="catalog"
+              >
+                Catalog
+              </div>
+              <ul
+                aria-multiselectable="false"
+                class="MuiTreeView-root"
+                role="tree"
+              >
+                <li
+                  aria-selected="true"
+                  class="MuiTreeItem-root Mui-selected"
+                  data-testid="*-tab"
+                  role="treeitem"
+                  tabindex="0"
+                >
+                  <div
+                    class="MuiTreeItem-content"
+                  >
+                    <div
+                      class="MuiTreeItem-iconContainer"
+                    />
+                    <div
+                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                    >
+                      Browse
+                    </div>
+                  </div>
+                </li>
+                <li
+                  aria-expanded="true"
+                  class="MuiTreeItem-root bordered Mui-expanded"
+                  role="treeitem"
+                  tabindex="-1"
+                >
+                  <div
+                    class="MuiTreeItem-content"
+                  >
+                    <div
+                      class="MuiTreeItem-iconContainer"
+                    >
+                      <i
+                        class="Icon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="expand_more"
+                        >
+                          expand_more
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                    >
+                      <div
+                        class="parent"
+                      >
+                        Categories
+                      </div>
+                    </div>
+                  </div>
+                  <ul
+                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
+                    role="group"
+                    style="min-height: 0px;"
+                  >
+                    <div
+                      class="MuiCollapse-wrapper"
+                    >
+                      <div
+                        class="MuiCollapse-wrapperInner"
+                      >
+                        <li
+                          class="MuiTreeItem-root"
+                          data-testid="entity.k8slens.dev/General-tab"
+                          role="treeitem"
+                          tabindex="-1"
+                        >
+                          <div
+                            class="MuiTreeItem-content"
+                          >
+                            <div
+                              class="MuiTreeItem-iconContainer"
+                            >
+                              <i
+                                class="Icon material focusable small"
+                              >
+                                <span
+                                  class="icon"
+                                  data-icon-name="settings"
+                                >
+                                  settings
+                                </span>
+                              </i>
+                            </div>
+                            <div
+                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                            >
+                              <div
+                                class="flex"
+                              >
+                                <div>
+                                  General
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li
+                          class="MuiTreeItem-root"
+                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                          role="treeitem"
+                          tabindex="-1"
+                        >
+                          <div
+                            class="MuiTreeItem-content"
+                          >
+                            <div
+                              class="MuiTreeItem-iconContainer"
+                            >
+                              <i
+                                class="Icon focusable small"
+                              >
+                                <span
+                                  class="icon"
+                                  data-icon-name=""
+                                />
+                              </i>
+                            </div>
+                            <div
+                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                            >
+                              <div
+                                class="flex"
+                              >
+                                <div>
+                                  Clusters
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li
+                          class="MuiTreeItem-root"
+                          data-testid="entity.k8slens.dev/WebLink-tab"
+                          role="treeitem"
+                          tabindex="-1"
+                        >
+                          <div
+                            class="MuiTreeItem-content"
+                          >
+                            <div
+                              class="MuiTreeItem-iconContainer"
+                            >
+                              <i
+                                class="Icon material focusable small"
+                              >
+                                <span
+                                  class="icon"
+                                  data-icon-name="public"
+                                >
+                                  public
+                                </span>
+                              </i>
+                            </div>
+                            <div
+                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                            >
+                              <div
+                                class="flex"
+                              >
+                                <div>
+                                  Web Links
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                      </div>
+                    </div>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+            <div
+              class="ResizingAnchor horizontal trailing"
+            />
+          </div>
+          <div
+            class="contents"
+          >
+            <div
+              class="views"
+            />
+          </div>
+          <div
+            class="footer"
+          />
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+  <div
+    class="Animate opacity-scale Dialog flex center dialog modal enter"
+    data-testid="delete-cluster-dialog"
+    style="--enter-duration: 100ms; --leave-duration: 100ms;"
+  >
+    <div
+      class="box"
+    >
+      <div
+        class="dialogContent"
+      >
+        <div>
+          Delete the 
+          <b>
+            some-context
+          </b>
+           context from Lens's internal kubeconfig?
+        </div>
+        <div
+          class="warning"
+        >
+          <i
+            class="Icon warningIcon material focusable"
+          >
+            <span
+              class="icon"
+              data-icon-name="warning_amber"
+            >
+              warning_amber
+            </span>
+          </i>
+          <p
+            data-testid="internal-kubeconfig-warning"
+          >
+            Are you sure you want to delete it? It can be re-added through the copy/paste mechanism.
+          </p>
+        </div>
+      </div>
+      <div
+        class="dialogButtons"
+      >
+        <button
+          class="Button plain"
+          type="button"
+        >
+          Cancel
+        </button>
+        <button
+          class="Button accent"
+          type="button"
+        >
+          Delete Context
+        </button>
+      </div>
+    </div>
+  </div>
+</body>
+`;
+
+exports[`Deleting a cluster when the kubeconfig has multiple clusters when the dialog is opened for not the current cluster renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="mainLayout"
+          style="--sidebar-width: 200px;"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="flex flex-col w-full"
+            >
+              <div
+                class="catalog"
+              >
+                Catalog
+              </div>
+              <ul
+                aria-multiselectable="false"
+                class="MuiTreeView-root"
+                role="tree"
+              >
+                <li
+                  aria-selected="true"
+                  class="MuiTreeItem-root Mui-selected"
+                  data-testid="*-tab"
+                  role="treeitem"
+                  tabindex="0"
+                >
+                  <div
+                    class="MuiTreeItem-content"
+                  >
+                    <div
+                      class="MuiTreeItem-iconContainer"
+                    />
+                    <div
+                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                    >
+                      Browse
+                    </div>
+                  </div>
+                </li>
+                <li
+                  aria-expanded="true"
+                  class="MuiTreeItem-root bordered Mui-expanded"
+                  role="treeitem"
+                  tabindex="-1"
+                >
+                  <div
+                    class="MuiTreeItem-content"
+                  >
+                    <div
+                      class="MuiTreeItem-iconContainer"
+                    >
+                      <i
+                        class="Icon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="expand_more"
+                        >
+                          expand_more
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                    >
+                      <div
+                        class="parent"
+                      >
+                        Categories
+                      </div>
+                    </div>
+                  </div>
+                  <ul
+                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
+                    role="group"
+                    style="min-height: 0px;"
+                  >
+                    <div
+                      class="MuiCollapse-wrapper"
+                    >
+                      <div
+                        class="MuiCollapse-wrapperInner"
+                      >
+                        <li
+                          class="MuiTreeItem-root"
+                          data-testid="entity.k8slens.dev/General-tab"
+                          role="treeitem"
+                          tabindex="-1"
+                        >
+                          <div
+                            class="MuiTreeItem-content"
+                          >
+                            <div
+                              class="MuiTreeItem-iconContainer"
+                            >
+                              <i
+                                class="Icon material focusable small"
+                              >
+                                <span
+                                  class="icon"
+                                  data-icon-name="settings"
+                                >
+                                  settings
+                                </span>
+                              </i>
+                            </div>
+                            <div
+                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                            >
+                              <div
+                                class="flex"
+                              >
+                                <div>
+                                  General
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li
+                          class="MuiTreeItem-root"
+                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                          role="treeitem"
+                          tabindex="-1"
+                        >
+                          <div
+                            class="MuiTreeItem-content"
+                          >
+                            <div
+                              class="MuiTreeItem-iconContainer"
+                            >
+                              <i
+                                class="Icon focusable small"
+                              >
+                                <span
+                                  class="icon"
+                                  data-icon-name=""
+                                />
+                              </i>
+                            </div>
+                            <div
+                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                            >
+                              <div
+                                class="flex"
+                              >
+                                <div>
+                                  Clusters
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li
+                          class="MuiTreeItem-root"
+                          data-testid="entity.k8slens.dev/WebLink-tab"
+                          role="treeitem"
+                          tabindex="-1"
+                        >
+                          <div
+                            class="MuiTreeItem-content"
+                          >
+                            <div
+                              class="MuiTreeItem-iconContainer"
+                            >
+                              <i
+                                class="Icon material focusable small"
+                              >
+                                <span
+                                  class="icon"
+                                  data-icon-name="public"
+                                >
+                                  public
+                                </span>
+                              </i>
+                            </div>
+                            <div
+                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                            >
+                              <div
+                                class="flex"
+                              >
+                                <div>
+                                  Web Links
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                      </div>
+                    </div>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+            <div
+              class="ResizingAnchor horizontal trailing"
+            />
+          </div>
+          <div
+            class="contents"
+          >
+            <div
+              class="views"
+            />
+          </div>
+          <div
+            class="footer"
+          />
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+  <div
+    class="Animate opacity-scale Dialog flex center dialog modal enter"
+    data-testid="delete-cluster-dialog"
+    style="--enter-duration: 100ms; --leave-duration: 100ms;"
+  >
+    <div
+      class="box"
+    >
+      <div
+        class="dialogContent"
+      >
+        <div>
+          Delete the 
+          <b>
+            some-non-current-context
+          </b>
+           context from 
+          <b>
+            ./temp-kube-config
+          </b>
+          ?
+        </div>
+        <div
+          class="warning"
+        >
+          <i
+            class="Icon warningIcon material focusable"
+          >
+            <span
+              class="icon"
+              data-icon-name="warning_amber"
+            >
+              warning_amber
+            </span>
+          </i>
+          <p
+            data-testid="kubeconfig-change-warning"
+          >
+            The contents of kubeconfig file will be changed!
+          </p>
+        </div>
+        <hr
+          class="hr"
+        />
+        <div
+          class="mt-4"
+        >
+          <label
+            class="Checkbox flex align-center"
+          >
+            <input
+              data-testid="delete-cluster-dialog-context-switch"
+              type="checkbox"
+            />
+            <i
+              class="box flex align-center"
+            />
+            <span
+              class="label"
+            >
+              <span
+                class="font-semibold"
+              >
+                Select current-context
+              </span>
+               
+              (optional)
+            </span>
+          </label>
+        </div>
+      </div>
+      <div
+        class="dialogButtons"
+      >
+        <button
+          class="Button plain"
+          type="button"
+        >
+          Cancel
+        </button>
+        <button
+          class="Button accent"
+          type="button"
+        >
+          Delete Context
+        </button>
+      </div>
+    </div>
+  </div>
+</body>
+`;
+
+exports[`Deleting a cluster when the kubeconfig has multiple clusters when the dialog is opened for not the current cluster when context switching checkbox is clicked renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="mainLayout"
+          style="--sidebar-width: 200px;"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="flex flex-col w-full"
+            >
+              <div
+                class="catalog"
+              >
+                Catalog
+              </div>
+              <ul
+                aria-multiselectable="false"
+                class="MuiTreeView-root"
+                role="tree"
+              >
+                <li
+                  aria-selected="true"
+                  class="MuiTreeItem-root Mui-selected"
+                  data-testid="*-tab"
+                  role="treeitem"
+                  tabindex="0"
+                >
+                  <div
+                    class="MuiTreeItem-content"
+                  >
+                    <div
+                      class="MuiTreeItem-iconContainer"
+                    />
+                    <div
+                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                    >
+                      Browse
+                    </div>
+                  </div>
+                </li>
+                <li
+                  aria-expanded="true"
+                  class="MuiTreeItem-root bordered Mui-expanded"
+                  role="treeitem"
+                  tabindex="-1"
+                >
+                  <div
+                    class="MuiTreeItem-content"
+                  >
+                    <div
+                      class="MuiTreeItem-iconContainer"
+                    >
+                      <i
+                        class="Icon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="expand_more"
+                        >
+                          expand_more
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                    >
+                      <div
+                        class="parent"
+                      >
+                        Categories
+                      </div>
+                    </div>
+                  </div>
+                  <ul
+                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
+                    role="group"
+                    style="min-height: 0px;"
+                  >
+                    <div
+                      class="MuiCollapse-wrapper"
+                    >
+                      <div
+                        class="MuiCollapse-wrapperInner"
+                      >
+                        <li
+                          class="MuiTreeItem-root"
+                          data-testid="entity.k8slens.dev/General-tab"
+                          role="treeitem"
+                          tabindex="-1"
+                        >
+                          <div
+                            class="MuiTreeItem-content"
+                          >
+                            <div
+                              class="MuiTreeItem-iconContainer"
+                            >
+                              <i
+                                class="Icon material focusable small"
+                              >
+                                <span
+                                  class="icon"
+                                  data-icon-name="settings"
+                                >
+                                  settings
+                                </span>
+                              </i>
+                            </div>
+                            <div
+                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                            >
+                              <div
+                                class="flex"
+                              >
+                                <div>
+                                  General
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li
+                          class="MuiTreeItem-root"
+                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                          role="treeitem"
+                          tabindex="-1"
+                        >
+                          <div
+                            class="MuiTreeItem-content"
+                          >
+                            <div
+                              class="MuiTreeItem-iconContainer"
+                            >
+                              <i
+                                class="Icon focusable small"
+                              >
+                                <span
+                                  class="icon"
+                                  data-icon-name=""
+                                />
+                              </i>
+                            </div>
+                            <div
+                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                            >
+                              <div
+                                class="flex"
+                              >
+                                <div>
+                                  Clusters
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li
+                          class="MuiTreeItem-root"
+                          data-testid="entity.k8slens.dev/WebLink-tab"
+                          role="treeitem"
+                          tabindex="-1"
+                        >
+                          <div
+                            class="MuiTreeItem-content"
+                          >
+                            <div
+                              class="MuiTreeItem-iconContainer"
+                            >
+                              <i
+                                class="Icon material focusable small"
+                              >
+                                <span
+                                  class="icon"
+                                  data-icon-name="public"
+                                >
+                                  public
+                                </span>
+                              </i>
+                            </div>
+                            <div
+                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                            >
+                              <div
+                                class="flex"
+                              >
+                                <div>
+                                  Web Links
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                      </div>
+                    </div>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+            <div
+              class="ResizingAnchor horizontal trailing"
+            />
+          </div>
+          <div
+            class="contents"
+          >
+            <div
+              class="views"
+            />
+          </div>
+          <div
+            class="footer"
+          />
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+  <div
+    class="Animate opacity-scale Dialog flex center dialog modal enter"
+    data-testid="delete-cluster-dialog"
+    style="--enter-duration: 100ms; --leave-duration: 100ms;"
+  >
+    <div
+      class="box"
+    >
+      <div
+        class="dialogContent"
+      >
+        <div>
+          Delete the 
+          <b>
+            some-non-current-context
+          </b>
+           context from 
+          <b>
+            ./temp-kube-config
+          </b>
+          ?
+        </div>
+        <div
+          class="warning"
+        >
+          <i
+            class="Icon warningIcon material focusable"
+          >
+            <span
+              class="icon"
+              data-icon-name="warning_amber"
+            >
+              warning_amber
+            </span>
+          </i>
+          <p
+            data-testid="kubeconfig-change-warning"
+          >
+            The contents of kubeconfig file will be changed!
+          </p>
+        </div>
+        <hr
+          class="hr"
+        />
+        <div
+          class="mt-4"
+        >
+          <label
+            class="Checkbox flex align-center checked"
+          >
+            <input
+              data-testid="delete-cluster-dialog-context-switch"
+              type="checkbox"
+            />
+            <i
+              class="box flex align-center"
+            />
+            <span
+              class="label"
+            >
+              <span
+                class="font-semibold"
+              >
+                Select current-context
+              </span>
+               
+              (optional)
+            </span>
+          </label>
+        </div>
+        <div
+          class="mt-4"
+        >
+          <div
+            class="Select theme-light ml-[1px] mr-[1px] css-b62m3t-container"
+          >
+            <span
+              class="css-1f43avz-a11yText-A11yText"
+              id="react-select-delete-cluster-input-live-region"
+            />
+            <span
+              aria-atomic="false"
+              aria-live="polite"
+              aria-relevant="additions text"
+              class="css-1f43avz-a11yText-A11yText"
+            />
+            <div
+              class="Select__control css-1s2u09g-control"
+            >
+              <div
+                class="Select__value-container css-319lph-ValueContainer"
+              >
+                <div
+                  class="Select__placeholder css-14el2xx-placeholder"
+                  id="react-select-delete-cluster-input-placeholder"
+                >
+                  Select new context...
+                </div>
+                <div
+                  class="Select__input-container css-6j8wv5-Input"
+                  data-value=""
+                >
+                  <input
+                    aria-autocomplete="list"
+                    aria-describedby="react-select-delete-cluster-input-placeholder"
+                    aria-expanded="false"
+                    aria-haspopup="true"
+                    autocapitalize="none"
+                    autocomplete="off"
+                    autocorrect="off"
+                    class="Select__input"
+                    id="delete-cluster-input"
+                    role="combobox"
+                    spellcheck="false"
+                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                    tabindex="0"
+                    type="text"
+                    value=""
+                  />
+                </div>
+              </div>
+              <div
+                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+              >
+                <span
+                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                />
+                <div
+                  aria-hidden="true"
+                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="css-tj5bde-Svg"
+                    focusable="false"
+                    height="20"
+                    viewBox="0 0 20 20"
+                    width="20"
+                  >
+                    <path
+                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                    />
+                  </svg>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="dialogButtons"
+      >
+        <button
+          class="Button plain"
+          type="button"
+        >
+          Cancel
+        </button>
+        <button
+          class="Button accent"
+          disabled=""
+          type="button"
+        >
+          Delete Context
+        </button>
+      </div>
+    </div>
+  </div>
+</body>
+`;
+
+exports[`Deleting a cluster when the kubeconfig has multiple clusters when the dialog is opened for the current cluster renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="mainLayout"
+          style="--sidebar-width: 200px;"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="flex flex-col w-full"
+            >
+              <div
+                class="catalog"
+              >
+                Catalog
+              </div>
+              <ul
+                aria-multiselectable="false"
+                class="MuiTreeView-root"
+                role="tree"
+              >
+                <li
+                  aria-selected="true"
+                  class="MuiTreeItem-root Mui-selected"
+                  data-testid="*-tab"
+                  role="treeitem"
+                  tabindex="0"
+                >
+                  <div
+                    class="MuiTreeItem-content"
+                  >
+                    <div
+                      class="MuiTreeItem-iconContainer"
+                    />
+                    <div
+                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                    >
+                      Browse
+                    </div>
+                  </div>
+                </li>
+                <li
+                  aria-expanded="true"
+                  class="MuiTreeItem-root bordered Mui-expanded"
+                  role="treeitem"
+                  tabindex="-1"
+                >
+                  <div
+                    class="MuiTreeItem-content"
+                  >
+                    <div
+                      class="MuiTreeItem-iconContainer"
+                    >
+                      <i
+                        class="Icon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="expand_more"
+                        >
+                          expand_more
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                    >
+                      <div
+                        class="parent"
+                      >
+                        Categories
+                      </div>
+                    </div>
+                  </div>
+                  <ul
+                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
+                    role="group"
+                    style="min-height: 0px;"
+                  >
+                    <div
+                      class="MuiCollapse-wrapper"
+                    >
+                      <div
+                        class="MuiCollapse-wrapperInner"
+                      >
+                        <li
+                          class="MuiTreeItem-root"
+                          data-testid="entity.k8slens.dev/General-tab"
+                          role="treeitem"
+                          tabindex="-1"
+                        >
+                          <div
+                            class="MuiTreeItem-content"
+                          >
+                            <div
+                              class="MuiTreeItem-iconContainer"
+                            >
+                              <i
+                                class="Icon material focusable small"
+                              >
+                                <span
+                                  class="icon"
+                                  data-icon-name="settings"
+                                >
+                                  settings
+                                </span>
+                              </i>
+                            </div>
+                            <div
+                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                            >
+                              <div
+                                class="flex"
+                              >
+                                <div>
+                                  General
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li
+                          class="MuiTreeItem-root"
+                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                          role="treeitem"
+                          tabindex="-1"
+                        >
+                          <div
+                            class="MuiTreeItem-content"
+                          >
+                            <div
+                              class="MuiTreeItem-iconContainer"
+                            >
+                              <i
+                                class="Icon focusable small"
+                              >
+                                <span
+                                  class="icon"
+                                  data-icon-name=""
+                                />
+                              </i>
+                            </div>
+                            <div
+                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                            >
+                              <div
+                                class="flex"
+                              >
+                                <div>
+                                  Clusters
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li
+                          class="MuiTreeItem-root"
+                          data-testid="entity.k8slens.dev/WebLink-tab"
+                          role="treeitem"
+                          tabindex="-1"
+                        >
+                          <div
+                            class="MuiTreeItem-content"
+                          >
+                            <div
+                              class="MuiTreeItem-iconContainer"
+                            >
+                              <i
+                                class="Icon material focusable small"
+                              >
+                                <span
+                                  class="icon"
+                                  data-icon-name="public"
+                                >
+                                  public
+                                </span>
+                              </i>
+                            </div>
+                            <div
+                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                            >
+                              <div
+                                class="flex"
+                              >
+                                <div>
+                                  Web Links
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                      </div>
+                    </div>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+            <div
+              class="ResizingAnchor horizontal trailing"
+            />
+          </div>
+          <div
+            class="contents"
+          >
+            <div
+              class="views"
+            />
+          </div>
+          <div
+            class="footer"
+          />
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+  <div
+    class="Animate opacity-scale Dialog flex center dialog modal enter"
+    data-testid="delete-cluster-dialog"
+    style="--enter-duration: 100ms; --leave-duration: 100ms;"
+  >
+    <div
+      class="box"
+    >
+      <div
+        class="dialogContent"
+      >
+        <div>
+          Delete the 
+          <b>
+            some-current-context
+          </b>
+           context from 
+          <b>
+            ./temp-kube-config
+          </b>
+          ?
+        </div>
+        <div
+          class="warning"
+        >
+          <i
+            class="Icon warningIcon material focusable"
+          >
+            <span
+              class="icon"
+              data-icon-name="warning_amber"
+            >
+              warning_amber
+            </span>
+          </i>
+          <p
+            data-testid="current-context-warning"
+          >
+            This will remove active context in kubeconfig. Use drop down below to select a different one.
+          </p>
+        </div>
+        <hr
+          class="hr"
+        />
+        <div
+          class="mt-4"
+        >
+          <label
+            class="Checkbox flex align-center checked"
+          >
+            <input
+              checked=""
+              data-testid="delete-cluster-dialog-context-switch"
+              type="checkbox"
+            />
+            <i
+              class="box flex align-center"
+            />
+            <span
+              class="label"
+            >
+              <span
+                class="font-semibold"
+              >
+                Select current-context
+              </span>
+               
+            </span>
+          </label>
+        </div>
+        <div
+          class="mt-4"
+        >
+          <div
+            class="Select theme-light ml-[1px] mr-[1px] css-b62m3t-container"
+          >
+            <span
+              class="css-1f43avz-a11yText-A11yText"
+              id="react-select-delete-cluster-input-live-region"
+            />
+            <span
+              aria-atomic="false"
+              aria-live="polite"
+              aria-relevant="additions text"
+              class="css-1f43avz-a11yText-A11yText"
+            />
+            <div
+              class="Select__control css-1s2u09g-control"
+            >
+              <div
+                class="Select__value-container css-319lph-ValueContainer"
+              >
+                <div
+                  class="Select__placeholder css-14el2xx-placeholder"
+                  id="react-select-delete-cluster-input-placeholder"
+                >
+                  Select new context...
+                </div>
+                <div
+                  class="Select__input-container css-6j8wv5-Input"
+                  data-value=""
+                >
+                  <input
+                    aria-autocomplete="list"
+                    aria-describedby="react-select-delete-cluster-input-placeholder"
+                    aria-expanded="false"
+                    aria-haspopup="true"
+                    autocapitalize="none"
+                    autocomplete="off"
+                    autocorrect="off"
+                    class="Select__input"
+                    id="delete-cluster-input"
+                    role="combobox"
+                    spellcheck="false"
+                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                    tabindex="0"
+                    type="text"
+                    value=""
+                  />
+                </div>
+              </div>
+              <div
+                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+              >
+                <span
+                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                />
+                <div
+                  aria-hidden="true"
+                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="css-tj5bde-Svg"
+                    focusable="false"
+                    height="20"
+                    viewBox="0 0 20 20"
+                    width="20"
+                  >
+                    <path
+                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                    />
+                  </svg>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="dialogButtons"
+      >
+        <button
+          class="Button plain"
+          type="button"
+        >
+          Cancel
+        </button>
+        <button
+          class="Button accent"
+          disabled=""
+          type="button"
+        >
+          Delete Context
+        </button>
+      </div>
+    </div>
+  </div>
+</body>
+`;
+
+exports[`Deleting a cluster when the kubeconfig has only one cluster when the dialog is opened renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="mainLayout"
+          style="--sidebar-width: 200px;"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="flex flex-col w-full"
+            >
+              <div
+                class="catalog"
+              >
+                Catalog
+              </div>
+              <ul
+                aria-multiselectable="false"
+                class="MuiTreeView-root"
+                role="tree"
+              >
+                <li
+                  aria-selected="true"
+                  class="MuiTreeItem-root Mui-selected"
+                  data-testid="*-tab"
+                  role="treeitem"
+                  tabindex="0"
+                >
+                  <div
+                    class="MuiTreeItem-content"
+                  >
+                    <div
+                      class="MuiTreeItem-iconContainer"
+                    />
+                    <div
+                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                    >
+                      Browse
+                    </div>
+                  </div>
+                </li>
+                <li
+                  aria-expanded="true"
+                  class="MuiTreeItem-root bordered Mui-expanded"
+                  role="treeitem"
+                  tabindex="-1"
+                >
+                  <div
+                    class="MuiTreeItem-content"
+                  >
+                    <div
+                      class="MuiTreeItem-iconContainer"
+                    >
+                      <i
+                        class="Icon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="expand_more"
+                        >
+                          expand_more
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                    >
+                      <div
+                        class="parent"
+                      >
+                        Categories
+                      </div>
+                    </div>
+                  </div>
+                  <ul
+                    class="MuiCollapse-root MuiTreeItem-group MuiCollapse-entered"
+                    role="group"
+                    style="min-height: 0px;"
+                  >
+                    <div
+                      class="MuiCollapse-wrapper"
+                    >
+                      <div
+                        class="MuiCollapse-wrapperInner"
+                      >
+                        <li
+                          class="MuiTreeItem-root"
+                          data-testid="entity.k8slens.dev/General-tab"
+                          role="treeitem"
+                          tabindex="-1"
+                        >
+                          <div
+                            class="MuiTreeItem-content"
+                          >
+                            <div
+                              class="MuiTreeItem-iconContainer"
+                            >
+                              <i
+                                class="Icon material focusable small"
+                              >
+                                <span
+                                  class="icon"
+                                  data-icon-name="settings"
+                                >
+                                  settings
+                                </span>
+                              </i>
+                            </div>
+                            <div
+                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                            >
+                              <div
+                                class="flex"
+                              >
+                                <div>
+                                  General
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li
+                          class="MuiTreeItem-root"
+                          data-testid="entity.k8slens.dev/KubernetesCluster-tab"
+                          role="treeitem"
+                          tabindex="-1"
+                        >
+                          <div
+                            class="MuiTreeItem-content"
+                          >
+                            <div
+                              class="MuiTreeItem-iconContainer"
+                            >
+                              <i
+                                class="Icon focusable small"
+                              >
+                                <span
+                                  class="icon"
+                                  data-icon-name=""
+                                />
+                              </i>
+                            </div>
+                            <div
+                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                            >
+                              <div
+                                class="flex"
+                              >
+                                <div>
+                                  Clusters
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li
+                          class="MuiTreeItem-root"
+                          data-testid="entity.k8slens.dev/WebLink-tab"
+                          role="treeitem"
+                          tabindex="-1"
+                        >
+                          <div
+                            class="MuiTreeItem-content"
+                          >
+                            <div
+                              class="MuiTreeItem-iconContainer"
+                            >
+                              <i
+                                class="Icon material focusable small"
+                              >
+                                <span
+                                  class="icon"
+                                  data-icon-name="public"
+                                >
+                                  public
+                                </span>
+                              </i>
+                            </div>
+                            <div
+                              class="MuiTypography-root MuiTreeItem-label MuiTypography-body1"
+                            >
+                              <div
+                                class="flex"
+                              >
+                                <div>
+                                  Web Links
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                      </div>
+                    </div>
+                  </ul>
+                </li>
+              </ul>
+            </div>
+            <div
+              class="ResizingAnchor horizontal trailing"
+            />
+          </div>
+          <div
+            class="contents"
+          >
+            <div
+              class="views"
+            />
+          </div>
+          <div
+            class="footer"
+          />
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+  <div
+    class="Animate opacity-scale Dialog flex center dialog modal enter"
+    data-testid="delete-cluster-dialog"
+    style="--enter-duration: 100ms; --leave-duration: 100ms;"
+  >
+    <div
+      class="box"
+    >
+      <div
+        class="dialogContent"
+      >
+        <div>
+          Delete the 
+          <b>
+            some-context
+          </b>
+           context from 
+          <b>
+            ./temp-kube-config
+          </b>
+          ?
+        </div>
+        <div
+          class="warning"
+        >
+          <i
+            class="Icon warningIcon material focusable"
+          >
+            <span
+              class="icon"
+              data-icon-name="warning_amber"
+            >
+              warning_amber
+            </span>
+          </i>
+          <p
+            data-testid="no-more-contexts-warning"
+          >
+            This will remove the last context in kubeconfig. There will be no active context.
+          </p>
+        </div>
+      </div>
+      <div
+        class="dialogButtons"
+      >
+        <button
+          class="Button plain"
+          type="button"
+        >
+          Cancel
+        </button>
+        <button
+          class="Button accent"
+          type="button"
+        >
+          Delete Context
+        </button>
+      </div>
+    </div>
+  </div>
+</body>
+`;
diff --git a/src/features/cluster/delete-dialog/common/clear-as-deleting-channel.ts b/src/features/cluster/delete-dialog/common/clear-as-deleting-channel.ts
new file mode 100644
index 0000000000..bf33a23165
--- /dev/null
+++ b/src/features/cluster/delete-dialog/common/clear-as-deleting-channel.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { ClusterId } from "../../../../common/cluster-types";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+
+export type ClearClusterAsDeletingChannel = RequestChannel<ClusterId, void>;
+
+export const clearClusterAsDeletingChannel: ClearClusterAsDeletingChannel = {
+  id: "clear-cluster-as-deleting",
+};
diff --git a/src/features/cluster/delete-dialog/common/delete-channel.ts b/src/features/cluster/delete-dialog/common/delete-channel.ts
new file mode 100644
index 0000000000..0e9142fcd3
--- /dev/null
+++ b/src/features/cluster/delete-dialog/common/delete-channel.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { ClusterId } from "../../../../common/cluster-types";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+
+export type DeleteClusterChannel = RequestChannel<ClusterId, void>;
+
+export const deleteClusterChannel: DeleteClusterChannel = {
+  id: "delete-cluster",
+};
diff --git a/src/features/cluster/delete-dialog/common/set-as-deleting-channel.ts b/src/features/cluster/delete-dialog/common/set-as-deleting-channel.ts
new file mode 100644
index 0000000000..57ef2e3a8d
--- /dev/null
+++ b/src/features/cluster/delete-dialog/common/set-as-deleting-channel.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { ClusterId } from "../../../../common/cluster-types";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+
+export type SetClusterAsDeletingChannel = RequestChannel<ClusterId, void>;
+
+export const setClusterAsDeletingChannel: SetClusterAsDeletingChannel = {
+  id: "set-cluster-as-deleting",
+};
diff --git a/src/features/cluster/delete-dialog/delete-cluster-dialog.test.tsx b/src/features/cluster/delete-dialog/delete-cluster-dialog.test.tsx
new file mode 100644
index 0000000000..c96f2714e1
--- /dev/null
+++ b/src/features/cluster/delete-dialog/delete-cluster-dialog.test.tsx
@@ -0,0 +1,280 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import "@testing-library/jest-dom/extend-expect";
+import { KubeConfig } from "@kubernetes/client-node";
+import type { RenderResult } from "@testing-library/react";
+import type { CreateCluster } from "../../../common/cluster/create-cluster-injection-token";
+import { createClusterInjectionToken } from "../../../common/cluster/create-cluster-injection-token";
+import createContextHandlerInjectable from "../../../main/context-handler/create-context-handler.injectable";
+import createKubeconfigManagerInjectable from "../../../main/kubeconfig-manager/create-kubeconfig-manager.injectable";
+import normalizedPlatformInjectable from "../../../common/vars/normalized-platform.injectable";
+import kubectlBinaryNameInjectable from "../../../main/kubectl/binary-name.injectable";
+import kubectlDownloadingNormalizedArchInjectable from "../../../main/kubectl/normalized-arch.injectable";
+import openDeleteClusterDialogInjectable, { type OpenDeleteClusterDialog } from "../../../renderer/components/delete-cluster-dialog/open.injectable";
+import { type ApplicationBuilder, getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
+import storesAndApisCanBeCreatedInjectable from "../../../renderer/stores-apis-can-be-created.injectable";
+import type { Cluster } from "../../../common/cluster/cluster";
+import navigateToCatalogInjectable from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
+import directoryForKubeConfigsInjectable from "../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
+import joinPathsInjectable from "../../../common/path/join-paths.injectable";
+
+const currentClusterServerUrl = "https://localhost";
+const nonCurrentClusterServerUrl = "http://localhost";
+const multiClusterConfig = `
+apiVersion: v1
+clusters:
+- cluster:
+    server: ${currentClusterServerUrl}
+  name: some-current-context-cluster
+- cluster:
+    server: ${nonCurrentClusterServerUrl}
+  name: some-non-current-context-cluster
+contexts:
+- context:
+    cluster: some-current-context-cluster
+    user: some-user
+  name: some-current-context
+- context:
+    cluster: some-non-current-context-cluster
+    user: some-user
+  name: some-non-current-context
+current-context: some-current-context
+kind: Config
+preferences: {}
+users:
+- name: some-user
+  user:
+    token: kubeconfig-user-q4lm4:xxxyyyy
+`;
+
+const singleClusterServerUrl = "http://localhost";
+const singleClusterConfig = `
+apiVersion: v1
+clusters:
+- cluster:
+    server: ${singleClusterServerUrl}
+  name: some-cluster
+contexts:
+- context:
+    cluster: some-cluster
+    user: some-user
+  name: some-context
+current-context: some-context
+kind: Config
+preferences: {}
+users:
+- name: some-user
+  user:
+    token: kubeconfig-user-q4lm4:xxxyyyy
+`;
+
+describe("Deleting a cluster", () => {
+  let builder: ApplicationBuilder;
+  let openDeleteClusterDialog: OpenDeleteClusterDialog;
+  let createCluster: CreateCluster;
+  let rendered: RenderResult;
+  let config: KubeConfig;
+
+  beforeEach(async () => {
+    config = new KubeConfig();
+    builder = getApplicationBuilder();
+
+    builder.beforeApplicationStart((mainDi) => {
+      mainDi.override(createContextHandlerInjectable, () => () => undefined as never);
+      mainDi.override(createKubeconfigManagerInjectable, () => () => undefined as never);
+      mainDi.override(kubectlBinaryNameInjectable, () => "kubectl");
+      mainDi.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64");
+      mainDi.override(normalizedPlatformInjectable, () => "darwin");
+    });
+
+    builder.beforeWindowStart((windowDi) => {
+      windowDi.override(storesAndApisCanBeCreatedInjectable, () => true);
+      openDeleteClusterDialog = windowDi.inject(openDeleteClusterDialogInjectable);
+    });
+
+    builder.afterWindowStart(windowDi => {
+      createCluster = windowDi.inject(createClusterInjectionToken);
+
+      const navigateToCatalog = windowDi.inject(navigateToCatalogInjectable);
+
+      navigateToCatalog();
+    });
+
+    rendered = await builder.render();
+  });
+
+  describe("when the kubeconfig has multiple clusters", () => {
+    let currentCluster: Cluster;
+    let nonCurrentCluster: Cluster;
+
+    beforeEach(() => {
+      config.loadFromString(multiClusterConfig);
+
+      currentCluster = createCluster({
+        id: "some-current-context-cluster",
+        contextName: "some-current-context",
+        preferences: {
+          clusterName: "some-current-context-cluster",
+        },
+        kubeConfigPath: "./temp-kube-config",
+      }, {
+        clusterServerUrl: currentClusterServerUrl,
+      });
+      nonCurrentCluster = createCluster({
+        id: "some-non-current-context-cluster",
+        contextName: "some-non-current-context",
+        preferences: {
+          clusterName: "some-non-current-context-cluster",
+        },
+        kubeConfigPath: "./temp-kube-config",
+      }, {
+        clusterServerUrl: currentClusterServerUrl,
+      });
+    });
+
+    describe("when the dialog is opened for the current cluster", () => {
+      // TODO: replace with actual behaviour instead of technical use
+      beforeEach(async () => {
+        openDeleteClusterDialog({
+          cluster: currentCluster,
+          config,
+        });
+
+        await rendered.findByTestId("delete-cluster-dialog");
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("shows context switcher", () => {
+        expect(rendered.queryByText("Select new context...")).toBeInTheDocument();
+      });
+
+      it("shows warning", () => {
+        expect(rendered.queryByTestId("current-context-warning")).toBeInTheDocument();
+      });
+    });
+
+    describe("when the dialog is opened for not the current cluster", () => {
+      // TODO: replace with actual behaviour instead of technical use
+      beforeEach(async () => {
+        openDeleteClusterDialog({
+          cluster: nonCurrentCluster,
+          config,
+        });
+
+        await rendered.findByTestId("delete-cluster-dialog");
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("shows warning", () => {
+        expect(rendered.queryByTestId("kubeconfig-change-warning")).toBeInTheDocument();
+      });
+
+      it("does not show context switcher", () => {
+        expect(rendered.queryByText("Select new context...")).not.toBeInTheDocument();
+      });
+
+      describe("when context switching checkbox is clicked", () => {
+        beforeEach(() => {
+          rendered.getByTestId("delete-cluster-dialog-context-switch").click();
+        });
+
+        it("renders", () => {
+          expect(rendered.baseElement).toMatchSnapshot();
+        });
+
+        it("shows context switcher", () => {
+          expect(rendered.queryByText("Select new context...")).toBeInTheDocument();
+        });
+      });
+    });
+  });
+
+  describe("when an internal kubeconfig cluster is used", () => {
+    let currentCluster: Cluster;
+
+    beforeEach(() => {
+      config.loadFromString(singleClusterConfig);
+
+      const directoryForKubeConfigs = builder.applicationWindow.only.di.inject(directoryForKubeConfigsInjectable);
+      const joinPaths = builder.applicationWindow.only.di.inject(joinPathsInjectable);
+
+      currentCluster = createCluster({
+        id: "some-cluster",
+        contextName: "some-context",
+        preferences: {
+          clusterName: "some-cluster",
+        },
+        kubeConfigPath: joinPaths(directoryForKubeConfigs, "some-cluster.json"),
+      }, {
+        clusterServerUrl: singleClusterServerUrl,
+      });
+    });
+
+    describe("when the dialog is opened", () => {
+      // TODO: replace with actual behaviour instead of technical use
+      beforeEach(async () => {
+        openDeleteClusterDialog({
+          cluster: currentCluster,
+          config,
+        });
+
+        await rendered.findByTestId("delete-cluster-dialog");
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("shows warning", () => {
+        expect(rendered.queryByTestId("internal-kubeconfig-warning")).toBeInTheDocument();
+      });
+    });
+  });
+
+  describe("when the kubeconfig has only one cluster", () => {
+    let currentCluster: Cluster;
+
+    beforeEach(() => {
+      config.loadFromString(singleClusterConfig);
+
+      currentCluster = createCluster({
+        id: "some-cluster",
+        contextName: "some-context",
+        preferences: {
+          clusterName: "some-cluster",
+        },
+        kubeConfigPath: "./temp-kube-config",
+      }, {
+        clusterServerUrl: singleClusterServerUrl,
+      });
+    });
+
+    describe("when the dialog is opened", () => {
+      // TODO: replace with actual behaviour instead of technical use
+      beforeEach(async () => {
+        openDeleteClusterDialog({
+          cluster: currentCluster,
+          config,
+        });
+
+        await rendered.findByTestId("delete-cluster-dialog");
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("shows warning", () => {
+        expect(rendered.queryByTestId("no-more-contexts-warning")).toBeInTheDocument();
+      });
+    });
+  });
+});
diff --git a/src/features/cluster/delete-dialog/main/clear-as-deleting-channel-listener.injectable.ts b/src/features/cluster/delete-dialog/main/clear-as-deleting-channel-listener.injectable.ts
new file mode 100644
index 0000000000..a8dd2a80b0
--- /dev/null
+++ b/src/features/cluster/delete-dialog/main/clear-as-deleting-channel-listener.injectable.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import clustersThatAreBeingDeletedInjectable from "../../../../main/cluster/are-being-deleted.injectable";
+import { getRequestChannelListenerInjectable } from "../../../../main/utils/channel/channel-listeners/listener-tokens";
+import { clearClusterAsDeletingChannel } from "../common/clear-as-deleting-channel";
+
+const clearClusterAsDeletingChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: clearClusterAsDeletingChannel,
+  handler: (di) => {
+    const clustersThatAreBeingDeleted = di.inject(clustersThatAreBeingDeletedInjectable);
+
+    return (clusterId) => {
+      clustersThatAreBeingDeleted.delete(clusterId);
+    };
+  },
+});
+
+export default clearClusterAsDeletingChannelListenerInjectable;
diff --git a/src/features/cluster/delete-dialog/main/delete-channel-listener.injectable.ts b/src/features/cluster/delete-dialog/main/delete-channel-listener.injectable.ts
new file mode 100644
index 0000000000..a2ede65ec0
--- /dev/null
+++ b/src/features/cluster/delete-dialog/main/delete-channel-listener.injectable.ts
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import emitAppEventInjectable from "../../../../common/app-event-bus/emit-event.injectable";
+import clusterFramesInjectable from "../../../../common/cluster-frames.injectable";
+import clusterStoreInjectable from "../../../../common/cluster-store/cluster-store.injectable";
+import directoryForLensLocalStorageInjectable from "../../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable";
+import deleteFileInjectable from "../../../../common/fs/delete-file.injectable";
+import joinPathsInjectable from "../../../../common/path/join-paths.injectable";
+import { noop } from "../../../../common/utils";
+import { getRequestChannelListenerInjectable } from "../../../../main/utils/channel/channel-listeners/listener-tokens";
+import { deleteClusterChannel } from "../common/delete-channel";
+
+const deleteClusterChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: deleteClusterChannel,
+  handler: (di) => {
+    const emitAppEvent = di.inject(emitAppEventInjectable);
+    const clusterStore = di.inject(clusterStoreInjectable);
+    const clusterFrames = di.inject(clusterFramesInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
+    const directoryForLensLocalStorage = di.inject(directoryForLensLocalStorageInjectable);
+    const deleteFile = di.inject(deleteFileInjectable);
+
+    return async (clusterId) => {
+      emitAppEvent({ name: "cluster", action: "remove" });
+
+      const cluster = clusterStore.getById(clusterId);
+
+      if (!cluster) {
+        return;
+      }
+
+      cluster.disconnect();
+      clusterFrames.delete(cluster.id);
+
+      // Remove from the cluster store as well, this should clear any old settings
+      clusterStore.clusters.delete(cluster.id);
+
+      // remove the local storage file
+      const localStorageFilePath = joinPaths(directoryForLensLocalStorage, `${cluster.id}.json`);
+
+      await deleteFile(localStorageFilePath).catch(noop);
+    };
+  },
+});
+
+export default deleteClusterChannelListenerInjectable;
diff --git a/src/features/cluster/delete-dialog/main/set-as-deleteing-channel-listener.injectable.ts b/src/features/cluster/delete-dialog/main/set-as-deleteing-channel-listener.injectable.ts
new file mode 100644
index 0000000000..f532b4a81f
--- /dev/null
+++ b/src/features/cluster/delete-dialog/main/set-as-deleteing-channel-listener.injectable.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import clustersThatAreBeingDeletedInjectable from "../../../../main/cluster/are-being-deleted.injectable";
+import { getRequestChannelListenerInjectable } from "../../../../main/utils/channel/channel-listeners/listener-tokens";
+import { setClusterAsDeletingChannel } from "../common/set-as-deleting-channel";
+
+const setClusterAsDeletingChannelHandlerInjectable = getRequestChannelListenerInjectable({
+  channel: setClusterAsDeletingChannel,
+  handler: (di) => {
+    const clustersThatAreBeingDeleted = di.inject(clustersThatAreBeingDeletedInjectable);
+
+    return (clusterId) => {
+      clustersThatAreBeingDeleted.add(clusterId);
+    };
+  },
+});
+
+export default setClusterAsDeletingChannelHandlerInjectable;
diff --git a/src/features/cluster/delete-dialog/renderer/request-clear-as-deleting.injectable.ts b/src/features/cluster/delete-dialog/renderer/request-clear-as-deleting.injectable.ts
new file mode 100644
index 0000000000..e476998ca0
--- /dev/null
+++ b/src/features/cluster/delete-dialog/renderer/request-clear-as-deleting.injectable.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { ClusterId } from "../../../../common/cluster-types";
+import requestFromChannelInjectable from "../../../../renderer/utils/channel/request-from-channel.injectable";
+import { clearClusterAsDeletingChannel } from "../common/clear-as-deleting-channel";
+
+export type RequestClearClusterAsDeleting = (clusterId: ClusterId) => Promise<void>;
+
+const requestClearClusterAsDeletingInjectable = getInjectable({
+  id: "request-clear-cluster-as-deleting",
+  instantiate: (di): RequestClearClusterAsDeleting => {
+    const requestChannel = di.inject(requestFromChannelInjectable);
+
+    return (clusterId) => requestChannel(clearClusterAsDeletingChannel, clusterId);
+  },
+});
+
+export default requestClearClusterAsDeletingInjectable;
diff --git a/src/features/cluster/delete-dialog/renderer/request-delete.injectable.ts b/src/features/cluster/delete-dialog/renderer/request-delete.injectable.ts
new file mode 100644
index 0000000000..c1286e3103
--- /dev/null
+++ b/src/features/cluster/delete-dialog/renderer/request-delete.injectable.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { ClusterId } from "../../../../common/cluster-types";
+import requestFromChannelInjectable from "../../../../renderer/utils/channel/request-from-channel.injectable";
+import { deleteClusterChannel } from "../common/delete-channel";
+
+export type RequestDeleteCluster = (clusterId: ClusterId) => Promise<void>;
+
+const requestDeleteClusterInjectable = getInjectable({
+  id: "request-delete-cluster",
+  instantiate: (di): RequestDeleteCluster => {
+    const requestChannel = di.inject(requestFromChannelInjectable);
+
+    return (clusterId) => requestChannel(deleteClusterChannel, clusterId);
+  },
+});
+
+export default requestDeleteClusterInjectable;
diff --git a/src/features/cluster/delete-dialog/renderer/request-set-as-deleting.injectable.ts b/src/features/cluster/delete-dialog/renderer/request-set-as-deleting.injectable.ts
new file mode 100644
index 0000000000..de3a6393b3
--- /dev/null
+++ b/src/features/cluster/delete-dialog/renderer/request-set-as-deleting.injectable.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { ClusterId } from "../../../../common/cluster-types";
+import requestFromChannelInjectable from "../../../../renderer/utils/channel/request-from-channel.injectable";
+import { setClusterAsDeletingChannel } from "../common/set-as-deleting-channel";
+
+export type RequestSetClusterAsDeleting = (clusterId: ClusterId) => Promise<void>;
+
+const requestSetClusterAsDeletingInjectable = getInjectable({
+  id: "request-set-cluster-as-deleting",
+  instantiate: (di): RequestSetClusterAsDeleting => {
+    const requestChannel = di.inject(requestFromChannelInjectable);
+
+    return (clusterId) => requestChannel(setClusterAsDeletingChannel, clusterId);
+  },
+});
+
+export default requestSetClusterAsDeletingInjectable;
diff --git a/src/features/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap
index d7daa6bf14..7c81e1dfd7 100644
--- a/src/features/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/features/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap
@@ -310,6 +310,7 @@ exports[`disable-cluster-pages-when-cluster-is-not-relevant given extension shou
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -319,7 +320,9 @@ exports[`disable-cluster-pages-when-cluster-is-not-relevant given extension shou
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -817,6 +820,7 @@ exports[`disable-cluster-pages-when-cluster-is-not-relevant given extension shou
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -826,7 +830,9 @@ exports[`disable-cluster-pages-when-cluster-is-not-relevant given extension shou
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1324,6 +1330,7 @@ exports[`disable-cluster-pages-when-cluster-is-not-relevant given not yet known
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1333,7 +1340,9 @@ exports[`disable-cluster-pages-when-cluster-is-not-relevant given not yet known
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap
index 3dde5af5d5..5642dbcf22 100644
--- a/src/features/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/features/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap
@@ -448,6 +448,7 @@ exports[`disable sidebar items when cluster is not relevant given extension shou
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -457,7 +458,9 @@ exports[`disable sidebar items when cluster is not relevant given extension shou
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -955,6 +958,7 @@ exports[`disable sidebar items when cluster is not relevant given extension shou
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -964,7 +968,9 @@ exports[`disable sidebar items when cluster is not relevant given extension shou
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1462,6 +1468,7 @@ exports[`disable sidebar items when cluster is not relevant given not yet known
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1471,7 +1478,9 @@ exports[`disable sidebar items when cluster is not relevant given not yet known
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap
index 60f0d0095a..0221082e02 100644
--- a/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap
@@ -367,6 +367,7 @@ exports[`disable kube object detail items when cluster is not relevant given ext
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -376,7 +377,9 @@ exports[`disable kube object detail items when cluster is not relevant given ext
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -849,6 +852,7 @@ exports[`disable kube object detail items when cluster is not relevant given ext
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -858,7 +862,9 @@ exports[`disable kube object detail items when cluster is not relevant given ext
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1331,6 +1337,7 @@ exports[`disable kube object detail items when cluster is not relevant given not
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1340,7 +1347,9 @@ exports[`disable kube object detail items when cluster is not relevant given not
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/kube-object-menu/extension-api/__snapshots__/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/kube-object-menu/extension-api/__snapshots__/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx.snap
index 9459045e02..292a820f4b 100644
--- a/src/features/cluster/kube-object-menu/extension-api/__snapshots__/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/features/cluster/kube-object-menu/extension-api/__snapshots__/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx.snap
@@ -315,6 +315,7 @@ exports[`disable kube object menu items when cluster is not relevant given exten
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -324,7 +325,9 @@ exports[`disable kube object menu items when cluster is not relevant given exten
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -701,6 +704,7 @@ exports[`disable kube object menu items when cluster is not relevant given exten
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -710,7 +714,9 @@ exports[`disable kube object menu items when cluster is not relevant given exten
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1087,6 +1093,7 @@ exports[`disable kube object menu items when cluster is not relevant given not y
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1096,7 +1103,9 @@ exports[`disable kube object menu items when cluster is not relevant given not y
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/kube-object-status-icon/__snapshots__/show-status-for-a-kube-object.test.tsx.snap b/src/features/cluster/kube-object-status-icon/__snapshots__/show-status-for-a-kube-object.test.tsx.snap
index 042e9f02ab..dec48cdc12 100644
--- a/src/features/cluster/kube-object-status-icon/__snapshots__/show-status-for-a-kube-object.test.tsx.snap
+++ b/src/features/cluster/kube-object-status-icon/__snapshots__/show-status-for-a-kube-object.test.tsx.snap
@@ -304,6 +304,7 @@ exports[`show status for a kube object given application starts and in test page
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -313,7 +314,9 @@ exports[`show status for a kube object given application starts and in test page
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -725,6 +728,7 @@ exports[`show status for a kube object given application starts and in test page
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -734,7 +738,9 @@ exports[`show status for a kube object given application starts and in test page
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1146,6 +1152,7 @@ exports[`show status for a kube object given application starts and in test page
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1155,7 +1162,9 @@ exports[`show status for a kube object given application starts and in test page
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1527,6 +1536,7 @@ exports[`show status for a kube object given application starts and in test page
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1536,7 +1546,9 @@ exports[`show status for a kube object given application starts and in test page
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1908,6 +1920,7 @@ exports[`show status for a kube object given application starts and in test page
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1917,7 +1930,9 @@ exports[`show status for a kube object given application starts and in test page
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -2329,6 +2344,7 @@ exports[`show status for a kube object given application starts and in test page
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -2338,7 +2354,9 @@ exports[`show status for a kube object given application starts and in test page
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/kube-object-status-icon/extension-api/__snapshots__/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/kube-object-status-icon/extension-api/__snapshots__/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx.snap
index 001f97e00b..9fc7e6bbf1 100644
--- a/src/features/cluster/kube-object-status-icon/extension-api/__snapshots__/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/features/cluster/kube-object-status-icon/extension-api/__snapshots__/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx.snap
@@ -344,6 +344,7 @@ exports[`disable kube object statuses when cluster is not relevant given extensi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -353,7 +354,9 @@ exports[`disable kube object statuses when cluster is not relevant given extensi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -725,6 +728,7 @@ exports[`disable kube object statuses when cluster is not relevant given extensi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -734,7 +738,9 @@ exports[`disable kube object statuses when cluster is not relevant given extensi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1106,6 +1112,7 @@ exports[`disable kube object statuses when cluster is not relevant given not yet
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1115,7 +1122,9 @@ exports[`disable kube object statuses when cluster is not relevant given not yet
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/legacy-extension-adding-cluster-frame-components.test.tsx b/src/features/cluster/legacy-extension-adding-cluster-frame-components.test.tsx
new file mode 100644
index 0000000000..f837550f7a
--- /dev/null
+++ b/src/features/cluster/legacy-extension-adding-cluster-frame-components.test.tsx
@@ -0,0 +1,78 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { RenderResult } from "@testing-library/react";
+import { act } from "@testing-library/react";
+import type { IObservableValue } from "mobx";
+import { computed, observable, runInAction } from "mobx";
+import React from "react";
+import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+
+describe("legacy extension adding cluster frame components", () => {
+  let builder: ApplicationBuilder;
+  let rendered: RenderResult;
+
+  beforeEach(() => {
+    builder = getApplicationBuilder();
+    builder.setEnvironmentToClusterFrame();
+  });
+
+  describe("given custom components for cluster view available", () => {
+    let someObservable: IObservableValue<boolean>;
+
+    beforeEach(async () => {
+      someObservable = observable.box(false);
+
+      const testExtension = {
+        id: "some-extension-id",
+        name: "some-extension-name",
+
+        rendererOptions: {
+          clusterFrameComponents: [
+            {
+              id: "test-modal-id",
+              Component: () => <div data-testid="test-modal">test modal</div>,
+              shouldRender: computed(() => true),
+            },
+            {
+              id: "dialog-with-observable-visibility-id",
+              Component: () => <div data-testid="dialog-with-observable-visibility">dialog contents</div>,
+              shouldRender: computed(() => someObservable.get()),
+            },
+          ],
+        },
+      };
+
+      rendered = await builder.render();
+      builder.extensions.enable(testExtension);
+    });
+
+    it("renders", () => {
+      expect(rendered.container).toMatchSnapshot();
+    });
+
+    it("renders provided component html", () => {
+      const modal = rendered.getByTestId("test-modal");
+
+      expect(modal).toBeInTheDocument();
+    });
+
+    it("doesn't render component which should be invisible", () => {
+      const dialog = rendered.queryByTestId("dialog-with-observable-visibility");
+
+      expect(dialog).not.toBeInTheDocument();
+    });
+
+    it("when injectable component becomes visible, shows it", () => {
+      runInAction(() => {
+        act(() => someObservable.set(true));
+      });
+
+      const dialog = rendered.getByTestId("dialog-with-observable-visibility");
+
+      expect(dialog).toBeInTheDocument();
+    });
+  });
+});
diff --git a/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap b/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap
index f46517dc0b..b087beee3d 100644
--- a/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap
+++ b/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap
@@ -548,6 +548,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -557,7 +558,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1183,6 +1186,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -1192,7 +1196,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1823,6 +1829,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -1832,7 +1839,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -2532,6 +2541,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -2541,7 +2551,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -2581,6 +2593,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-second-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -2590,7 +2603,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-second-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -3216,6 +3231,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -3225,7 +3241,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -3265,6 +3283,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-second-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -3274,7 +3293,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-second-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -3972,6 +3993,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -3981,7 +4003,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -4021,6 +4045,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-second-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -4030,7 +4055,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-second-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -4730,6 +4757,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -4739,7 +4767,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -5453,6 +5483,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -5462,7 +5493,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -6171,6 +6204,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -6180,7 +6214,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -6880,6 +6916,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -6889,7 +6926,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -7589,6 +7628,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -7598,7 +7638,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -8845,6 +8887,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -8854,7 +8897,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -10657,6 +10702,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -10666,7 +10712,9 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap b/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap
index e23184d8fc..f82cbc2e0e 100644
--- a/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap
+++ b/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap
@@ -455,6 +455,7 @@ exports[`cluster/namespaces - edit namespaces from previously opened tab given t
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -464,7 +465,9 @@ exports[`cluster/namespaces - edit namespaces from previously opened tab given t
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -997,6 +1000,7 @@ exports[`cluster/namespaces - edit namespaces from previously opened tab given t
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -1006,7 +1010,9 @@ exports[`cluster/namespaces - edit namespaces from previously opened tab given t
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx b/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx
index 2272fc0db6..519e6bb3c8 100644
--- a/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx
+++ b/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx
@@ -22,7 +22,6 @@ import pathExistsInjectable from "../../common/fs/path-exists.injectable";
 import readJsonFileInjectable from "../../common/fs/read-json-file.injectable";
 import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token";
 import sidebarStorageInjectable from "../../renderer/components/layout/sidebar-storage/sidebar-storage.injectable";
-import hostedClusterIdInjectable from "../../renderer/cluster-frame-context/hosted-cluster-id.injectable";
 import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time";
 import storageSaveDelayInjectable from "../../renderer/utils/create-storage/storage-save-delay.injectable";
 
@@ -38,7 +37,6 @@ describe("cluster - sidebar and tab navigation for core", () => {
     builder.setEnvironmentToClusterFrame();
 
     builder.beforeWindowStart((windowDi) => {
-      windowDi.override(hostedClusterIdInjectable, () => "some-hosted-cluster-id");
       windowDi.override(storageSaveDelayInjectable, () => 250);
 
       windowDi.override(
@@ -98,7 +96,7 @@ describe("cluster - sidebar and tab navigation for core", () => {
           const writeJsonFileFake = windowDi.inject(writeJsonFileInjectable);
 
           await writeJsonFileFake(
-            "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
+            "/some-directory-for-lens-local-storage/some-cluster-id.json",
             {
               sidebar: {
                 expanded: { "some-parent-id": true },
@@ -286,7 +284,7 @@ describe("cluster - sidebar and tab navigation for core", () => {
             const readJsonFileFake = windowDi.inject(readJsonFileInjectable);
 
             const actual = await readJsonFileFake(
-              "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
+              "/some-directory-for-lens-local-storage/some-cluster-id.json",
             );
 
             expect(actual).toEqual({
diff --git a/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx b/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx
index 8d3de582ad..a228cc880e 100644
--- a/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx
+++ b/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx
@@ -15,7 +15,6 @@ import pathExistsInjectable from "../../common/fs/path-exists.injectable";
 import readJsonFileInjectable from "../../common/fs/read-json-file.injectable";
 import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token";
 import assert from "assert";
-import hostedClusterIdInjectable from "../../renderer/cluster-frame-context/hosted-cluster-id.injectable";
 import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time";
 import type { IObservableValue } from "mobx";
 import { runInAction, computed, observable } from "mobx";
@@ -34,7 +33,6 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
     applicationBuilder.setEnvironmentToClusterFrame();
 
     applicationBuilder.beforeWindowStart((windowDi) => {
-      windowDi.override(hostedClusterIdInjectable, () => "some-hosted-cluster-id");
       windowDi.override(storageSaveDelayInjectable, () => 250);
 
       windowDi.override(
@@ -178,7 +176,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
           const writeJsonFileFake = windowDi.inject(writeJsonFileInjectable);
 
           await writeJsonFileFake(
-            "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
+            "/some-directory-for-lens-local-storage/some-cluster-id.json",
             {
               sidebar: {
                 expanded: { "some-extension-name-some-parent-id": true },
@@ -214,7 +212,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
           const writeJsonFileFake = windowDi.inject(writeJsonFileInjectable);
 
           await writeJsonFileFake(
-            "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
+            "/some-directory-for-lens-local-storage/some-cluster-id.json",
             {
               sidebar: {
                 expanded: { "some-extension-name-some-unknown-parent-id": true },
@@ -244,7 +242,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
           const writeJsonFileFake = windowDi.inject(writeJsonFileInjectable);
 
           await writeJsonFileFake(
-            "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
+            "/some-directory-for-lens-local-storage/some-cluster-id.json",
             {
               someThingButSidebar: {},
             },
@@ -390,7 +388,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
             const pathExistsFake = windowDi.inject(pathExistsInjectable);
 
             const actual = await pathExistsFake(
-              "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
+              "/some-directory-for-lens-local-storage/some-cluster-id.json",
             );
 
             expect(actual).toBe(false);
@@ -402,7 +400,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
             const readJsonFileFake = windowDi.inject(readJsonFileInjectable);
 
             const actual = await readJsonFileFake(
-              "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
+              "/some-directory-for-lens-local-storage/some-cluster-id.json",
             );
 
             expect(actual).toEqual({
diff --git a/src/features/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap
index 2fd23c30cc..4dc26ef987 100644
--- a/src/features/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/features/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap
@@ -435,6 +435,7 @@ exports[`disable workloads overview details when cluster is not relevant given e
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -444,7 +445,9 @@ exports[`disable workloads overview details when cluster is not relevant given e
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -942,6 +945,7 @@ exports[`disable workloads overview details when cluster is not relevant given e
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -951,7 +955,9 @@ exports[`disable workloads overview details when cluster is not relevant given e
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1449,6 +1455,7 @@ exports[`disable workloads overview details when cluster is not relevant given n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1458,7 +1465,9 @@ exports[`disable workloads overview details when cluster is not relevant given n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap b/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap
index cf68d3d742..2217f50a3d 100644
--- a/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap
+++ b/src/features/command-pallet/__snapshots__/keyboard-shortcuts.test.tsx.snap
@@ -13,121 +13,148 @@ exports[`Command Pallet: keyboard shortcut tests when on linux renders 1`] = `
           class="items"
         >
           <div
-            class="winMenu"
+            class="preventedDragging"
           >
             <div
-              data-testid="window-menu"
+              class="winMenu"
             >
-              <svg
-                height="12"
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
-                width="12"
+              <div
+                data-testid="window-menu"
               >
-                <path
-                  d="M0,8.5h12v1H0V8.5z"
-                  fill="currentColor"
-                />
-                <path
-                  d="M0,5.5h12v1H0V5.5z"
-                  fill="currentColor"
-                />
-                <path
-                  d="M0,2.5h12v1H0V2.5z"
-                  fill="currentColor"
-                />
-              </svg>
+                <svg
+                  height="12"
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                  width="12"
+                >
+                  <path
+                    d="M0,8.5h12v1H0V8.5z"
+                    fill="currentColor"
+                  />
+                  <path
+                    d="M0,5.5h12v1H0V5.5z"
+                    fill="currentColor"
+                  />
+                  <path
+                    d="M0,2.5h12v1H0V2.5z"
+                    fill="currentColor"
+                  />
+                </svg>
+              </div>
             </div>
           </div>
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
-          >
-            <span
-              class="icon"
-              data-icon-name="home"
-            >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
-            >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
-            >
-              arrow_forward
-            </span>
-          </i>
-        </div>
-        <div
-          class="items"
-        >
           <div
-            class="windowButtons linuxButtons"
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+          <div
+            class="preventedDragging"
           >
             <div
-              class="minimize"
-              data-testid="window-minimize"
+              class="windowButtons linuxButtons"
             >
-              <svg
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
+              <div
+                class="minimize"
+                data-testid="window-minimize"
               >
-                <rect
-                  fill="currentColor"
-                  height="1"
-                  width="10"
-                  x="1"
-                  y="9"
-                />
-              </svg>
-            </div>
-            <div
-              class="maximize"
-              data-testid="window-maximize"
-            >
-              <svg
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
+                <svg
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                >
+                  <rect
+                    fill="currentColor"
+                    height="1"
+                    width="10"
+                    x="1"
+                    y="9"
+                  />
+                </svg>
+              </div>
+              <div
+                class="maximize"
+                data-testid="window-maximize"
               >
-                <rect
-                  fill="none"
-                  height="9"
-                  stroke="currentColor"
-                  width="9"
-                  x="1.5"
-                  y="1.5"
-                />
-              </svg>
-            </div>
-            <div
-              class="close"
-              data-testid="window-close"
-            >
-              <svg
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
+                <svg
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                >
+                  <rect
+                    fill="none"
+                    height="9"
+                    stroke="currentColor"
+                    width="9"
+                    x="1.5"
+                    y="1.5"
+                  />
+                </svg>
+              </div>
+              <div
+                class="close"
+                data-testid="window-close"
               >
-                <polygon
-                  fill="currentColor"
-                  points="11 1.576 6.583 6 11 10.424 10.424 11 6 6.583 1.576 11 1 10.424 5.417 6 1 1.576 1.576 1 6 5.417 10.424 1"
-                />
-              </svg>
+                <svg
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                >
+                  <polygon
+                    fill="currentColor"
+                    points="11 1.576 6.583 6 11 10.424 10.424 11 6 6.583 1.576 11 1 10.424 5.417 6 1 1.576 1.576 1 6 5.417 10.424 1"
+                  />
+                </svg>
+              </div>
             </div>
           </div>
         </div>
@@ -159,7 +186,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux renders 1`] = `
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -265,6 +292,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux renders 1`] = `
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -296,121 +324,148 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing ESC
           class="items"
         >
           <div
-            class="winMenu"
+            class="preventedDragging"
           >
             <div
-              data-testid="window-menu"
+              class="winMenu"
             >
-              <svg
-                height="12"
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
-                width="12"
+              <div
+                data-testid="window-menu"
               >
-                <path
-                  d="M0,8.5h12v1H0V8.5z"
-                  fill="currentColor"
-                />
-                <path
-                  d="M0,5.5h12v1H0V5.5z"
-                  fill="currentColor"
-                />
-                <path
-                  d="M0,2.5h12v1H0V2.5z"
-                  fill="currentColor"
-                />
-              </svg>
+                <svg
+                  height="12"
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                  width="12"
+                >
+                  <path
+                    d="M0,8.5h12v1H0V8.5z"
+                    fill="currentColor"
+                  />
+                  <path
+                    d="M0,5.5h12v1H0V5.5z"
+                    fill="currentColor"
+                  />
+                  <path
+                    d="M0,2.5h12v1H0V2.5z"
+                    fill="currentColor"
+                  />
+                </svg>
+              </div>
             </div>
           </div>
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
-          >
-            <span
-              class="icon"
-              data-icon-name="home"
-            >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
-            >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
-            >
-              arrow_forward
-            </span>
-          </i>
-        </div>
-        <div
-          class="items"
-        >
           <div
-            class="windowButtons linuxButtons"
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+          <div
+            class="preventedDragging"
           >
             <div
-              class="minimize"
-              data-testid="window-minimize"
+              class="windowButtons linuxButtons"
             >
-              <svg
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
+              <div
+                class="minimize"
+                data-testid="window-minimize"
               >
-                <rect
-                  fill="currentColor"
-                  height="1"
-                  width="10"
-                  x="1"
-                  y="9"
-                />
-              </svg>
-            </div>
-            <div
-              class="maximize"
-              data-testid="window-maximize"
-            >
-              <svg
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
+                <svg
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                >
+                  <rect
+                    fill="currentColor"
+                    height="1"
+                    width="10"
+                    x="1"
+                    y="9"
+                  />
+                </svg>
+              </div>
+              <div
+                class="maximize"
+                data-testid="window-maximize"
               >
-                <rect
-                  fill="none"
-                  height="9"
-                  stroke="currentColor"
-                  width="9"
-                  x="1.5"
-                  y="1.5"
-                />
-              </svg>
-            </div>
-            <div
-              class="close"
-              data-testid="window-close"
-            >
-              <svg
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
+                <svg
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                >
+                  <rect
+                    fill="none"
+                    height="9"
+                    stroke="currentColor"
+                    width="9"
+                    x="1.5"
+                    y="1.5"
+                  />
+                </svg>
+              </div>
+              <div
+                class="close"
+                data-testid="window-close"
               >
-                <polygon
-                  fill="currentColor"
-                  points="11 1.576 6.583 6 11 10.424 10.424 11 6 6.583 1.576 11 1 10.424 5.417 6 1 1.576 1.576 1 6 5.417 10.424 1"
-                />
-              </svg>
+                <svg
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                >
+                  <polygon
+                    fill="currentColor"
+                    points="11 1.576 6.583 6 11 10.424 10.424 11 6 6.583 1.576 11 1 10.424 5.417 6 1 1.576 1.576 1 6 5.417 10.424 1"
+                  />
+                </svg>
+              </div>
             </div>
           </div>
         </div>
@@ -442,7 +497,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing ESC
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -548,6 +603,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing ESC
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -579,121 +635,148 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing SHI
           class="items"
         >
           <div
-            class="winMenu"
+            class="preventedDragging"
           >
             <div
-              data-testid="window-menu"
+              class="winMenu"
             >
-              <svg
-                height="12"
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
-                width="12"
+              <div
+                data-testid="window-menu"
               >
-                <path
-                  d="M0,8.5h12v1H0V8.5z"
-                  fill="currentColor"
-                />
-                <path
-                  d="M0,5.5h12v1H0V5.5z"
-                  fill="currentColor"
-                />
-                <path
-                  d="M0,2.5h12v1H0V2.5z"
-                  fill="currentColor"
-                />
-              </svg>
+                <svg
+                  height="12"
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                  width="12"
+                >
+                  <path
+                    d="M0,8.5h12v1H0V8.5z"
+                    fill="currentColor"
+                  />
+                  <path
+                    d="M0,5.5h12v1H0V5.5z"
+                    fill="currentColor"
+                  />
+                  <path
+                    d="M0,2.5h12v1H0V2.5z"
+                    fill="currentColor"
+                  />
+                </svg>
+              </div>
             </div>
           </div>
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
-          >
-            <span
-              class="icon"
-              data-icon-name="home"
-            >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
-            >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
-            >
-              arrow_forward
-            </span>
-          </i>
-        </div>
-        <div
-          class="items"
-        >
           <div
-            class="windowButtons linuxButtons"
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+          <div
+            class="preventedDragging"
           >
             <div
-              class="minimize"
-              data-testid="window-minimize"
+              class="windowButtons linuxButtons"
             >
-              <svg
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
+              <div
+                class="minimize"
+                data-testid="window-minimize"
               >
-                <rect
-                  fill="currentColor"
-                  height="1"
-                  width="10"
-                  x="1"
-                  y="9"
-                />
-              </svg>
-            </div>
-            <div
-              class="maximize"
-              data-testid="window-maximize"
-            >
-              <svg
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
+                <svg
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                >
+                  <rect
+                    fill="currentColor"
+                    height="1"
+                    width="10"
+                    x="1"
+                    y="9"
+                  />
+                </svg>
+              </div>
+              <div
+                class="maximize"
+                data-testid="window-maximize"
               >
-                <rect
-                  fill="none"
-                  height="9"
-                  stroke="currentColor"
-                  width="9"
-                  x="1.5"
-                  y="1.5"
-                />
-              </svg>
-            </div>
-            <div
-              class="close"
-              data-testid="window-close"
-            >
-              <svg
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
+                <svg
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                >
+                  <rect
+                    fill="none"
+                    height="9"
+                    stroke="currentColor"
+                    width="9"
+                    x="1.5"
+                    y="1.5"
+                  />
+                </svg>
+              </div>
+              <div
+                class="close"
+                data-testid="window-close"
               >
-                <polygon
-                  fill="currentColor"
-                  points="11 1.576 6.583 6 11 10.424 10.424 11 6 6.583 1.576 11 1 10.424 5.417 6 1 1.576 1.576 1 6 5.417 10.424 1"
-                />
-              </svg>
+                <svg
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                >
+                  <polygon
+                    fill="currentColor"
+                    points="11 1.576 6.583 6 11 10.424 10.424 11 6 6.583 1.576 11 1 10.424 5.417 6 1 1.576 1.576 1 6 5.417 10.424 1"
+                  />
+                </svg>
+              </div>
             </div>
           </div>
         </div>
@@ -725,7 +808,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing SHI
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -831,6 +914,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing SHI
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -874,121 +958,148 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing SHI
           class="items"
         >
           <div
-            class="winMenu"
+            class="preventedDragging"
           >
             <div
-              data-testid="window-menu"
+              class="winMenu"
             >
-              <svg
-                height="12"
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
-                width="12"
+              <div
+                data-testid="window-menu"
               >
-                <path
-                  d="M0,8.5h12v1H0V8.5z"
-                  fill="currentColor"
-                />
-                <path
-                  d="M0,5.5h12v1H0V5.5z"
-                  fill="currentColor"
-                />
-                <path
-                  d="M0,2.5h12v1H0V2.5z"
-                  fill="currentColor"
-                />
-              </svg>
+                <svg
+                  height="12"
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                  width="12"
+                >
+                  <path
+                    d="M0,8.5h12v1H0V8.5z"
+                    fill="currentColor"
+                  />
+                  <path
+                    d="M0,5.5h12v1H0V5.5z"
+                    fill="currentColor"
+                  />
+                  <path
+                    d="M0,2.5h12v1H0V2.5z"
+                    fill="currentColor"
+                  />
+                </svg>
+              </div>
             </div>
           </div>
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
-          >
-            <span
-              class="icon"
-              data-icon-name="home"
-            >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
-            >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
-          >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
-            >
-              arrow_forward
-            </span>
-          </i>
-        </div>
-        <div
-          class="items"
-        >
           <div
-            class="windowButtons linuxButtons"
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+          <div
+            class="preventedDragging"
           >
             <div
-              class="minimize"
-              data-testid="window-minimize"
+              class="windowButtons linuxButtons"
             >
-              <svg
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
+              <div
+                class="minimize"
+                data-testid="window-minimize"
               >
-                <rect
-                  fill="currentColor"
-                  height="1"
-                  width="10"
-                  x="1"
-                  y="9"
-                />
-              </svg>
-            </div>
-            <div
-              class="maximize"
-              data-testid="window-maximize"
-            >
-              <svg
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
+                <svg
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                >
+                  <rect
+                    fill="currentColor"
+                    height="1"
+                    width="10"
+                    x="1"
+                    y="9"
+                  />
+                </svg>
+              </div>
+              <div
+                class="maximize"
+                data-testid="window-maximize"
               >
-                <rect
-                  fill="none"
-                  height="9"
-                  stroke="currentColor"
-                  width="9"
-                  x="1.5"
-                  y="1.5"
-                />
-              </svg>
-            </div>
-            <div
-              class="close"
-              data-testid="window-close"
-            >
-              <svg
-                shape-rendering="crispEdges"
-                viewBox="0 0 12 12"
+                <svg
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                >
+                  <rect
+                    fill="none"
+                    height="9"
+                    stroke="currentColor"
+                    width="9"
+                    x="1.5"
+                    y="1.5"
+                  />
+                </svg>
+              </div>
+              <div
+                class="close"
+                data-testid="window-close"
               >
-                <polygon
-                  fill="currentColor"
-                  points="11 1.576 6.583 6 11 10.424 10.424 11 6 6.583 1.576 11 1 10.424 5.417 6 1 1.576 1.576 1 6 5.417 10.424 1"
-                />
-              </svg>
+                <svg
+                  shape-rendering="crispEdges"
+                  viewBox="0 0 12 12"
+                >
+                  <polygon
+                    fill="currentColor"
+                    points="11 1.576 6.583 6 11 10.424 10.424 11 6 6.583 1.576 11 1 10.424 5.417 6 1 1.576 1.576 1 6 5.417 10.424 1"
+                  />
+                </svg>
+              </div>
             </div>
           </div>
         </div>
@@ -1020,7 +1131,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing SHI
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -1126,6 +1237,7 @@ exports[`Command Pallet: keyboard shortcut tests when on linux when pressing SHI
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1156,44 +1268,61 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS renders 1`] = `
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1222,7 +1351,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS renders 1`] = `
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -1328,6 +1457,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS renders 1`] = `
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1358,44 +1488,61 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS when pressing ESC
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1424,7 +1571,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS when pressing ESC
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -1530,6 +1677,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS when pressing ESC
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1560,44 +1708,61 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS when pressing SHI
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1626,7 +1791,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS when pressing SHI
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -1732,6 +1897,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS when pressing SHI
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1774,44 +1940,61 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS when pressing SHI
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1840,7 +2023,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS when pressing SHI
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -1946,6 +2129,7 @@ exports[`Command Pallet: keyboard shortcut tests when on macOS when pressing SHI
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
index 118c5b9cc3..73b7dcdc8d 100644
--- a/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/features/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -11,44 +11,61 @@ exports[`extensions - navigation using application menu renders 1`] = `
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="home-button"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -77,7 +94,7 @@ exports[`extensions - navigation using application menu renders 1`] = `
               style="width: 320px;"
             >
               <h2>
-                Welcome to OpenLens!
+                Welcome to some-product-name!
               </h2>
               <p>
                 To get you started we have auto-detected your clusters in your
@@ -183,6 +200,7 @@ exports[`extensions - navigation using application menu renders 1`] = `
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -211,44 +229,62 @@ exports[`extensions - navigation using application menu when navigating to exten
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -275,7 +311,7 @@ exports[`extensions - navigation using application menu when navigating to exten
                 <p>
                   Add new features via Lens Extensions. Check out the 
                   <a
-                    href="https://docs.k8slens.dev/main/extensions/"
+                    href="https://docs.k8slens.dev/extensions/"
                     rel="noreferrer"
                     target="_blank"
                   >
@@ -409,6 +445,7 @@ exports[`extensions - navigation using application menu when navigating to exten
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/extensions/navigation-using-application-menu.test.ts b/src/features/extensions/navigation-using-application-menu.test.ts
index a9e7e23b74..c17653d7a3 100644
--- a/src/features/extensions/navigation-using-application-menu.test.ts
+++ b/src/features/extensions/navigation-using-application-menu.test.ts
@@ -6,6 +6,8 @@
 import type { RenderResult } from "@testing-library/react";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import downloadBinaryInjectable, { type DownloadBinary } from "../../common/fetch/download-binary.injectable";
+import downloadJsonInjectable, { type DownloadJson } from "../../common/fetch/download-json.injectable";
 import focusWindowInjectable from "../../renderer/navigation/focus-window.injectable";
 
 // TODO: Make components free of side effects by making them deterministic
@@ -15,14 +17,20 @@ describe("extensions - navigation using application menu", () => {
   let builder: ApplicationBuilder;
   let rendered: RenderResult;
   let focusWindowMock: jest.Mock;
+  let downloadJson: jest.MockedFunction<DownloadJson>;
+  let downloadBinary: jest.MockedFunction<DownloadBinary>;
 
   beforeEach(async () => {
     builder = getApplicationBuilder();
 
     builder.beforeWindowStart((windowDi) => {
       focusWindowMock = jest.fn();
+      downloadJson = jest.fn().mockImplementation((url) => { throw new Error(`Unexpected call to downloadJson for url=${url}`); });
+      downloadBinary = jest.fn().mockImplementation((url) => { throw new Error(`Unexpected call to downloadJson for url=${url}`); });
 
       windowDi.override(focusWindowInjectable, () => focusWindowMock);
+      windowDi.override(downloadJsonInjectable, () => downloadJson);
+      windowDi.override(downloadBinaryInjectable, () => downloadBinary);
     });
 
     rendered = await builder.render();
@@ -40,7 +48,7 @@ describe("extensions - navigation using application menu", () => {
 
   describe("when navigating to extensions using application menu", () => {
     beforeEach(() => {
-      builder.applicationMenu.click("root.extensions");
+      builder.applicationMenu.click("root", "mac", "navigate-to-extensions");
     });
 
     it("focuses the window", () => {
diff --git a/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
index c02c727480..5f2785c71f 100644
--- a/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
@@ -12,44 +12,62 @@ exports[`add custom helm repository in preferences when navigating to preference
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -57,7 +75,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -69,68 +86,72 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -144,231 +165,61 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -384,9 +235,9 @@ exports[`add custom helm repository in preferences when navigating to preference
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -394,7 +245,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -402,7 +253,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -415,20 +266,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -452,30 +289,256 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -560,6 +623,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -590,44 +654,62 @@ exports[`add custom helm repository in preferences when navigating to preference
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -635,7 +717,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -647,68 +728,72 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -722,231 +807,61 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -955,31 +870,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -993,7 +909,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -1015,56 +931,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -1149,6 +1276,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1179,44 +1307,62 @@ exports[`add custom helm repository in preferences when navigating to preference
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1224,7 +1370,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -1236,68 +1381,72 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -1311,231 +1460,61 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -1544,31 +1523,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1582,7 +1562,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -1604,56 +1584,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -1738,6 +1929,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1879,44 +2071,62 @@ exports[`add custom helm repository in preferences when navigating to preference
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1924,7 +2134,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -1936,68 +2145,72 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -2011,231 +2224,61 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -2244,31 +2287,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2282,7 +2326,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -2304,56 +2348,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -2438,6 +2693,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -2476,44 +2732,62 @@ exports[`add custom helm repository in preferences when navigating to preference
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -2521,7 +2795,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -2533,68 +2806,72 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -2608,231 +2885,61 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -2841,31 +2948,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2879,7 +2987,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -2901,56 +3009,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -3035,6 +3354,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -3176,44 +3496,62 @@ exports[`add custom helm repository in preferences when navigating to preference
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -3221,7 +3559,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -3233,68 +3570,72 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -3308,231 +3649,61 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -3541,31 +3712,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -3579,7 +3751,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -3601,56 +3773,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -3735,6 +4118,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -4058,44 +4442,62 @@ exports[`add custom helm repository in preferences when navigating to preference
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -4103,7 +4505,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -4115,68 +4516,72 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -4190,231 +4595,61 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -4423,31 +4658,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -4461,7 +4697,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -4483,56 +4719,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -4617,6 +5064,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -4758,44 +5206,62 @@ exports[`add custom helm repository in preferences when navigating to preference
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -4803,7 +5269,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -4815,68 +5280,72 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -4890,231 +5359,61 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -5123,31 +5422,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -5161,7 +5461,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -5183,56 +5483,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -5317,6 +5828,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -5640,44 +6152,62 @@ exports[`add custom helm repository in preferences when navigating to preference
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -5685,7 +6215,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -5697,68 +6226,72 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -5772,231 +6305,61 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -6005,31 +6368,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -6043,7 +6407,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -6065,56 +6429,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -6199,6 +6774,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -6341,44 +6917,62 @@ exports[`add custom helm repository in preferences when navigating to preference
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -6386,7 +6980,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -6398,68 +6991,72 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -6473,231 +7070,61 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -6706,31 +7133,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -6744,7 +7172,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -6766,56 +7194,267 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some active repository"
-                            >
-                              Some active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some active repository"
+                              >
+                                Some active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -6900,6 +7539,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -6916,7 +7556,7 @@ exports[`add custom helm repository in preferences when navigating to preference
     />
   </div>
   <div
-    class="Animate opacity-scale Dialog flex center AddHelmRepoDialog modal enter leave"
+    class="Animate opacity-scale Dialog flex center AddHelmRepoDialog modal enter"
     style="--enter-duration: 100ms; --leave-duration: 100ms;"
   >
     <div
@@ -6938,44 +7578,62 @@ exports[`add custom helm repository in preferences when navigating to preference
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -6983,7 +7641,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -6995,68 +7652,72 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -7070,231 +7731,61 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -7310,9 +7801,9 @@ exports[`add custom helm repository in preferences when navigating to preference
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -7320,7 +7811,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -7328,7 +7819,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -7341,20 +7832,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -7378,30 +7855,256 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -7486,6 +8189,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -7502,7 +8206,7 @@ exports[`add custom helm repository in preferences when navigating to preference
     />
   </div>
   <div
-    class="Animate opacity-scale Dialog flex center AddHelmRepoDialog modal enter leave"
+    class="Animate opacity-scale Dialog flex center AddHelmRepoDialog modal enter"
     style="--enter-duration: 100ms; --leave-duration: 100ms;"
   >
     <div
@@ -7524,44 +8228,62 @@ exports[`add custom helm repository in preferences when navigating to preference
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -7569,7 +8291,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -7581,68 +8302,72 @@ exports[`add custom helm repository in preferences when navigating to preference
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -7656,231 +8381,61 @@ exports[`add custom helm repository in preferences when navigating to preference
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -7896,9 +8451,9 @@ exports[`add custom helm repository in preferences when navigating to preference
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -7906,7 +8461,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -7914,7 +8469,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -7927,20 +8482,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -7964,30 +8505,256 @@ exports[`add custom helm repository in preferences when navigating to preference
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -8072,6 +8839,7 @@ exports[`add custom helm repository in preferences when navigating to preference
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
index 193511c896..6eb612a968 100644
--- a/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
@@ -12,44 +12,62 @@ exports[`add helm repository from list in preferences when navigating to prefere
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -57,7 +75,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -69,68 +86,72 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -144,231 +165,61 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -384,9 +235,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -394,7 +245,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -402,7 +253,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -415,20 +266,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -452,30 +289,256 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -560,6 +623,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -590,44 +654,62 @@ exports[`add helm repository from list in preferences when navigating to prefere
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -635,7 +717,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -647,68 +728,72 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -722,231 +807,61 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -955,31 +870,32 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -993,7 +909,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -1015,56 +931,267 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some already active repository"
-                            >
-                              Some already active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some already active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some already active repository"
+                              >
+                                Some already active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some already active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -1149,6 +1276,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1179,44 +1307,62 @@ exports[`add helm repository from list in preferences when navigating to prefere
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1224,7 +1370,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -1236,68 +1381,72 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -1311,231 +1460,61 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -1544,33 +1523,32 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control Select__control--menu-is-open css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                                  aria-expanded="true"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
+                                  aria-expanded="false"
                                   aria-haspopup="true"
-                                  aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1584,7 +1562,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -1606,56 +1584,269 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some already active repository"
-                            >
-                              Some already active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some already active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--menu-is-open css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="true"
+                                    aria-haspopup="true"
+                                    aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some already active repository"
+                              >
+                                Some already active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some already active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -1740,6 +1931,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1756,7 +1948,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
     />
   </div>
   <div
-    class="Select__menu-portal css-yj2v5g"
+    class="Select__menu-portal css-1no2yl0-MenuPortal"
   >
     <div
       class="theme-lens selection-of-active-public-helm-repository-options Select__menu css-26l3qy-menu"
@@ -1821,44 +2013,62 @@ exports[`add helm repository from list in preferences when navigating to prefere
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1866,7 +2076,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -1878,68 +2087,72 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -1953,231 +2166,61 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -2186,34 +2229,35 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
-                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                                   tabindex="0"
                                   type="text"
                                   value=""
@@ -2224,7 +2268,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -2246,56 +2290,267 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some already active repository"
-                            >
-                              Some already active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some already active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some already active repository"
+                              >
+                                Some already active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some already active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -2380,6 +2635,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -2410,44 +2666,62 @@ exports[`add helm repository from list in preferences when navigating to prefere
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -2455,7 +2729,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -2467,68 +2740,72 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -2542,231 +2819,61 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -2775,34 +2882,35 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
-                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                                   tabindex="0"
                                   type="text"
                                   value=""
@@ -2813,7 +2921,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -2835,56 +2943,267 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some already active repository"
-                            >
-                              Some already active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some already active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some already active repository"
+                              >
+                                Some already active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some already active repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -2969,6 +3288,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -2999,44 +3319,62 @@ exports[`add helm repository from list in preferences when navigating to prefere
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -3044,7 +3382,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -3056,68 +3393,72 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -3131,231 +3472,61 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -3371,9 +3542,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -3381,7 +3552,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -3389,10 +3560,10 @@ exports[`add helm repository from list in preferences when navigating to prefere
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
-                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                                   tabindex="0"
                                   type="text"
                                   value=""
@@ -3402,20 +3573,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -3439,30 +3596,256 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -3547,6 +3930,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -3577,44 +3961,62 @@ exports[`add helm repository from list in preferences when navigating to prefere
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -3622,7 +4024,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -3634,68 +4035,72 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -3709,231 +4114,61 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -3942,34 +4177,35 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
-                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                                   tabindex="0"
                                   type="text"
                                   value=""
@@ -3980,7 +4216,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -4002,90 +4238,301 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some already active repository"
-                            >
-                              Some already active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some already active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
-                          >
-                            Remove
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
                           </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
                         </div>
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="repos"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some to be added repository"
-                            >
-                              Some to be added repository
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some already active repository"
+                              >
+                                Some already active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
                             </div>
-                            <div
-                              class="repoUrl"
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some already active repository"
+                              tabindex="0"
                             >
-                              some-other-url
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                            >
+                              Remove
                             </div>
                           </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some to be added repository"
-                            tabindex="0"
-                          >
-                            <span
-                              class="icon"
-                              data-icon-name="delete"
-                            >
-                              delete
-                            </span>
-                          </i>
                           <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some to be added repository"
+                            class="item flex gaps align-center justify-space-between repo"
                           >
-                            Remove
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some to be added repository"
+                              >
+                                Some to be added repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-other-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some to be added repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some to be added repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -4170,6 +4617,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -4200,44 +4648,62 @@ exports[`add helm repository from list in preferences when navigating to prefere
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -4245,7 +4711,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -4257,68 +4722,72 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -4332,231 +4801,61 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -4565,33 +4864,32 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control Select__control--menu-is-open css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                                  aria-expanded="true"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
+                                  aria-expanded="false"
                                   aria-haspopup="true"
-                                  aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -4605,7 +4903,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -4627,90 +4925,303 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some already active repository"
-                            >
-                              Some already active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some already active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--menu-is-open css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
-                          >
-                            Remove
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="true"
+                                    aria-haspopup="true"
+                                    aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
                           </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
                         </div>
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="repos"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some to be added repository"
-                            >
-                              Some to be added repository
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some already active repository"
+                              >
+                                Some already active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
                             </div>
-                            <div
-                              class="repoUrl"
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some already active repository"
+                              tabindex="0"
                             >
-                              some-other-url
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                            >
+                              Remove
                             </div>
                           </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some to be added repository"
-                            tabindex="0"
-                          >
-                            <span
-                              class="icon"
-                              data-icon-name="delete"
-                            >
-                              delete
-                            </span>
-                          </i>
                           <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some to be added repository"
+                            class="item flex gaps align-center justify-space-between repo"
                           >
-                            Remove
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some to be added repository"
+                              >
+                                Some to be added repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-other-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some to be added repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some to be added repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -4795,6 +5306,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -4811,7 +5323,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
     />
   </div>
   <div
-    class="Select__menu-portal css-yj2v5g"
+    class="Select__menu-portal css-1no2yl0-MenuPortal"
   >
     <div
       class="theme-lens selection-of-active-public-helm-repository-options Select__menu css-26l3qy-menu"
@@ -4886,44 +5398,62 @@ exports[`add helm repository from list in preferences when navigating to prefere
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -4931,7 +5461,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -4943,68 +5472,72 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -5018,231 +5551,61 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -5251,34 +5614,35 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
-                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                                   tabindex="0"
                                   type="text"
                                   value=""
@@ -5289,7 +5653,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -5311,90 +5675,301 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some already active repository"
-                            >
-                              Some already active repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some already active repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
-                          >
-                            Remove
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
                           </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
                         </div>
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="repos"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-Some to be added repository"
-                            >
-                              Some to be added repository
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some already active repository"
+                              >
+                                Some already active repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
                             </div>
-                            <div
-                              class="repoUrl"
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some already active repository"
+                              tabindex="0"
                             >
-                              some-other-url
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some already active repository"
+                            >
+                              Remove
                             </div>
                           </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-Some to be added repository"
-                            tabindex="0"
-                          >
-                            <span
-                              class="icon"
-                              data-icon-name="delete"
-                            >
-                              delete
-                            </span>
-                          </i>
                           <div
-                            data-testid="tooltip-content-for-remove-helm-repository-Some to be added repository"
+                            class="item flex gaps align-center justify-space-between repo"
                           >
-                            Remove
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-Some to be added repository"
+                              >
+                                Some to be added repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-other-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-Some to be added repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-Some to be added repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -5479,6 +6054,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -5509,44 +6085,62 @@ exports[`add helm repository from list in preferences when navigating to prefere
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -5554,7 +6148,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -5566,68 +6159,72 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -5641,231 +6238,61 @@ exports[`add helm repository from list in preferences when navigating to prefere
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -5881,9 +6308,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -5891,7 +6318,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -5899,10 +6326,10 @@ exports[`add helm repository from list in preferences when navigating to prefere
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
-                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                                   tabindex="0"
                                   type="text"
                                   value=""
@@ -5912,20 +6339,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -5949,30 +6362,256 @@ exports[`add helm repository from list in preferences when navigating to prefere
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -6057,6 +6696,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
index 146fb371aa..79c164ca99 100644
--- a/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
@@ -12,44 +12,62 @@ exports[`listing active helm repositories in preferences when navigating to pref
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -57,7 +75,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -69,68 +86,72 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -144,231 +165,61 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -384,9 +235,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -394,7 +245,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -402,7 +253,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -415,20 +266,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -452,30 +289,256 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -560,6 +623,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -590,44 +654,62 @@ exports[`listing active helm repositories in preferences when navigating to pref
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -635,7 +717,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -647,68 +728,72 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -722,231 +807,61 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -962,9 +877,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -972,7 +887,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -980,7 +895,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -993,20 +908,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -1030,30 +931,256 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -1138,6 +1265,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1168,44 +1296,62 @@ exports[`listing active helm repositories in preferences when navigating to pref
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1213,7 +1359,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -1225,68 +1370,72 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -1300,230 +1449,272 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
+                        </div>
+                        <label
+                          class="Switch"
+                          data-testid="switch"
+                        >
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
+                          />
+                        </label>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-download-mirror"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
                         </div>
                         <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-download-mirror-input-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
                             >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
+                              >
+                                Download mirror for kubectl
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="download-mirror-input"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
-                            </svg>
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
                           </div>
                         </div>
-                      </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
                     </div>
                   </section>
-                  <section>
-                    <div
-                      class="SubTitle"
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
                     >
-                      Directory for binaries
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
                        
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                    <div
-                      class="hint"
-                    >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      class="notice"
+                      class="notice mt-3"
                     >
                       <div
                         class="flex-grow text-center"
                       >
-                        Error updating Helm repositories: Some error
+                        No files and folders have been synced yet
                       </div>
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        class="notice"
+                      >
+                        <div
+                          class="flex-grow text-center"
+                        >
+                          Error updating Helm repositories: Some error
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -1608,6 +1799,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1638,44 +1830,62 @@ exports[`listing active helm repositories in preferences when navigating to pref
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1683,7 +1893,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -1695,68 +1904,72 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -1770,231 +1983,61 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -2010,9 +2053,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -2020,7 +2063,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -2028,7 +2071,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2041,20 +2084,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -2078,30 +2107,256 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -2186,6 +2441,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -2216,44 +2472,62 @@ exports[`listing active helm repositories in preferences when navigating to pref
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -2261,7 +2535,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -2273,68 +2546,72 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -2348,230 +2625,272 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
+                        </div>
+                        <label
+                          class="Switch"
+                          data-testid="switch"
+                        >
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
+                          />
+                        </label>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-download-mirror"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
                         </div>
                         <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-download-mirror-input-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
                             >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
+                              >
+                                Download mirror for kubectl
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="download-mirror-input"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
-                            </svg>
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
                           </div>
                         </div>
-                      </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
                     </div>
                   </section>
-                  <section>
-                    <div
-                      class="SubTitle"
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
                     >
-                      Directory for binaries
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
                        
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                    <div
-                      class="hint"
-                    >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      class="notice"
+                      class="notice mt-3"
                     >
                       <div
                         class="flex-grow text-center"
                       >
-                        Error when adding default Helm repository: Some error
+                        No files and folders have been synced yet
                       </div>
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        class="notice"
+                      >
+                        <div
+                          class="flex-grow text-center"
+                        >
+                          Error when adding default Helm repository: Some error
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -2656,6 +2975,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -2686,44 +3006,62 @@ exports[`listing active helm repositories in preferences when navigating to pref
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -2731,7 +3069,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -2743,68 +3080,72 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -2818,231 +3159,61 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -3058,9 +3229,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -3068,7 +3239,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -3076,7 +3247,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -3089,20 +3260,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -3126,30 +3283,256 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -3234,6 +3617,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -3264,44 +3648,62 @@ exports[`listing active helm repositories in preferences when navigating to pref
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -3309,7 +3711,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -3321,68 +3722,72 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -3396,231 +3801,61 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -3629,31 +3864,32 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -3667,7 +3903,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -3689,90 +3925,301 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-some-repository"
-                            >
-                              some-repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-repository-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-some-repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-some-repository"
-                          >
-                            Remove
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
                           </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
                         </div>
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="repos"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-some-other-repository"
-                            >
-                              some-other-repository
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-some-repository"
+                              >
+                                some-repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-repository-url
+                              </div>
                             </div>
-                            <div
-                              class="repoUrl"
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-some-repository"
+                              tabindex="0"
                             >
-                              some-other-repository-url
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-some-repository"
+                            >
+                              Remove
                             </div>
                           </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-some-other-repository"
-                            tabindex="0"
-                          >
-                            <span
-                              class="icon"
-                              data-icon-name="delete"
-                            >
-                              delete
-                            </span>
-                          </i>
                           <div
-                            data-testid="tooltip-content-for-remove-helm-repository-some-other-repository"
+                            class="item flex gaps align-center justify-space-between repo"
                           >
-                            Remove
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-some-other-repository"
+                              >
+                                some-other-repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-other-repository-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-some-other-repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-some-other-repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -3857,6 +4304,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -3887,44 +4335,62 @@ exports[`listing active helm repositories in preferences when navigating to pref
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -3932,7 +4398,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -3944,68 +4409,72 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -4019,230 +4488,272 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
+                        </div>
+                        <label
+                          class="Switch"
+                          data-testid="switch"
+                        >
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
+                          />
+                        </label>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-download-mirror"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
                         </div>
                         <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-download-mirror-input-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
                             >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
+                              >
+                                Download mirror for kubectl
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="download-mirror-input"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
-                            </svg>
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
                           </div>
                         </div>
-                      </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
                     </div>
                   </section>
-                  <section>
-                    <div
-                      class="SubTitle"
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
                     >
-                      Directory for binaries
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
                        
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                    <div
-                      class="hint"
-                    >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      class="notice"
+                      class="notice mt-3"
                     >
                       <div
                         class="flex-grow text-center"
                       >
-                        Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CACHE was not present in \`$ helm env\`.
+                        No files and folders have been synced yet
                       </div>
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        class="notice"
+                      >
+                        <div
+                          class="flex-grow text-center"
+                        >
+                          Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CACHE was not present in \`$ helm env\`.
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -4327,6 +4838,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -4357,44 +4869,62 @@ exports[`listing active helm repositories in preferences when navigating to pref
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -4402,7 +4932,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -4414,68 +4943,72 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -4489,230 +5022,272 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
+                        </div>
+                        <label
+                          class="Switch"
+                          data-testid="switch"
+                        >
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
+                          />
+                        </label>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-download-mirror"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
                         </div>
                         <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-download-mirror-input-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
                             >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
+                              >
+                                Download mirror for kubectl
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="download-mirror-input"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
-                            </svg>
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
                           </div>
                         </div>
-                      </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
                     </div>
                   </section>
-                  <section>
-                    <div
-                      class="SubTitle"
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
                     >
-                      Directory for binaries
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
                        
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                    <div
-                      class="hint"
-                    >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      class="notice"
+                      class="notice mt-3"
                     >
                       <div
                         class="flex-grow text-center"
                       >
-                        Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CONFIG was not present in \`$ helm env\`.
+                        No files and folders have been synced yet
                       </div>
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        class="notice"
+                      >
+                        <div
+                          class="flex-grow text-center"
+                        >
+                          Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CONFIG was not present in \`$ helm env\`.
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -4797,6 +5372,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -4827,44 +5403,62 @@ exports[`listing active helm repositories in preferences when navigating to pref
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -4872,7 +5466,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -4884,68 +5477,72 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -4959,230 +5556,272 @@ exports[`listing active helm repositories in preferences when navigating to pref
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
+                        </div>
+                        <label
+                          class="Switch"
+                          data-testid="switch"
+                        >
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
+                          />
+                        </label>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-download-mirror"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
                         </div>
                         <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-download-mirror-input-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
                             >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
+                              >
+                                Download mirror for kubectl
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="download-mirror-input"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
-                            </svg>
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
                           </div>
                         </div>
-                      </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
                     </div>
                   </section>
-                  <section>
-                    <div
-                      class="SubTitle"
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
                     >
-                      Directory for binaries
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
                        
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                    <div
-                      class="hint"
-                    >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      class="notice"
+                      class="notice mt-3"
                     >
                       <div
                         class="flex-grow text-center"
                       >
-                        Error getting Helm configuration: some-error
+                        No files and folders have been synced yet
                       </div>
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        class="notice"
+                      >
+                        <div
+                          class="flex-grow text-center"
+                        >
+                          Error getting Helm configuration: some-error
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -5267,6 +5906,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
index 2cb3b4e60d..18e0054c7b 100644
--- a/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
@@ -12,44 +12,62 @@ exports[`remove helm repository from list of active repositories in preferences
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -57,7 +75,6 @@ exports[`remove helm repository from list of active repositories in preferences
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -69,68 +86,72 @@ exports[`remove helm repository from list of active repositories in preferences
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -144,231 +165,61 @@ exports[`remove helm repository from list of active repositories in preferences
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -384,9 +235,9 @@ exports[`remove helm repository from list of active repositories in preferences
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -394,7 +245,7 @@ exports[`remove helm repository from list of active repositories in preferences
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -402,7 +253,7 @@ exports[`remove helm repository from list of active repositories in preferences
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -415,20 +266,6 @@ exports[`remove helm repository from list of active repositories in preferences
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -452,30 +289,256 @@ exports[`remove helm repository from list of active repositories in preferences
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -560,6 +623,7 @@ exports[`remove helm repository from list of active repositories in preferences
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -590,44 +654,62 @@ exports[`remove helm repository from list of active repositories in preferences
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -635,7 +717,6 @@ exports[`remove helm repository from list of active repositories in preferences
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -647,68 +728,72 @@ exports[`remove helm repository from list of active repositories in preferences
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -722,231 +807,61 @@ exports[`remove helm repository from list of active repositories in preferences
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -955,31 +870,32 @@ exports[`remove helm repository from list of active repositories in preferences
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -993,7 +909,7 @@ exports[`remove helm repository from list of active repositories in preferences
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -1015,56 +931,267 @@ exports[`remove helm repository from list of active repositories in preferences
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-some-active-repository"
-                            >
-                              some-active-repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-some-active-repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-some-active-repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-some-active-repository"
+                              >
+                                some-active-repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-some-active-repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-some-active-repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -1149,6 +1276,7 @@ exports[`remove helm repository from list of active repositories in preferences
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1179,44 +1307,62 @@ exports[`remove helm repository from list of active repositories in preferences
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1224,7 +1370,6 @@ exports[`remove helm repository from list of active repositories in preferences
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -1236,68 +1381,72 @@ exports[`remove helm repository from list of active repositories in preferences
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -1311,231 +1460,61 @@ exports[`remove helm repository from list of active repositories in preferences
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow css-b62m3t-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -1544,31 +1523,32 @@ exports[`remove helm repository from list of active repositories in preferences
                             class="css-1f43avz-a11yText-A11yText"
                           />
                           <div
-                            class="Select__control css-1s2u09g-control"
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
                           >
                             <div
                               class="Select__value-container css-319lph-ValueContainer"
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
-                                class="Select__input-container css-6j8wv5-Input"
+                                class="Select__input-container css-jzldcf-Input"
                                 data-value=""
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
                                   autocomplete="off"
                                   autocorrect="off"
                                   class="Select__input"
-                                  id="selection-of-active-public-helm-repository"
+                                  disabled=""
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1582,7 +1562,7 @@ exports[`remove helm repository from list of active repositories in preferences
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
                               <span
-                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
                               <div
                                 aria-hidden="true"
@@ -1604,56 +1584,267 @@ exports[`remove helm repository from list of active repositories in preferences
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
                         >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
                       <div
-                        class="repos"
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
                       >
                         <div
-                          class="item flex gaps align-center justify-space-between repo"
+                          class="flex gaps"
                         >
-                          <div>
-                            <div
-                              class="repoName"
-                              data-testid="helm-repository-some-active-repository"
-                            >
-                              some-active-repository
-                            </div>
-                            <div
-                              class="repoUrl"
-                            >
-                              some-url
-                            </div>
-                          </div>
-                          <i
-                            class="Icon material interactive focusable"
-                            data-testid="remove-helm-repository-some-active-repository"
-                            tabindex="0"
+                          <div
+                            class="Select theme-lens box grow css-b62m3t-container"
                           >
                             <span
-                              class="icon"
-                              data-icon-name="delete"
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control css-1s2u09g-control"
                             >
-                              delete
-                            </span>
-                          </i>
-                          <div
-                            data-testid="tooltip-content-for-remove-helm-repository-some-active-repository"
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-6j8wv5-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <span
+                                  class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
                           >
-                            Remove
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="item flex gaps align-center justify-space-between repo"
+                          >
+                            <div>
+                              <div
+                                class="repoName"
+                                data-testid="helm-repository-some-active-repository"
+                              >
+                                some-active-repository
+                              </div>
+                              <div
+                                class="repoUrl"
+                              >
+                                some-url
+                              </div>
+                            </div>
+                            <i
+                              class="Icon material interactive focusable"
+                              data-testid="remove-helm-repository-some-active-repository"
+                              tabindex="0"
+                            >
+                              <span
+                                class="icon"
+                                data-icon-name="delete"
+                              >
+                                delete
+                              </span>
+                            </i>
+                            <div
+                              data-testid="tooltip-content-for-remove-helm-repository-some-active-repository"
+                            >
+                              Remove
+                            </div>
                           </div>
                         </div>
+                        <div />
                       </div>
-                      <div />
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -1738,6 +1929,7 @@ exports[`remove helm repository from list of active repositories in preferences
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -1768,44 +1960,62 @@ exports[`remove helm repository from list of active repositories in preferences
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -1813,7 +2023,6 @@ exports[`remove helm repository from list of active repositories in preferences
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -1825,68 +2034,72 @@ exports[`remove helm repository from list of active repositories in preferences
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -1900,231 +2113,61 @@ exports[`remove helm repository from list of active repositories in preferences
               class="content"
             >
               <section
-                id="kubernetes"
+                data-preference-page-test="kubernetes-page"
+                id="kubernetes-page"
               >
-                <section
-                  id="kubectl"
+                <h2
+                  data-preference-page-title-test="true"
                 >
-                  <h2
-                    data-testid="kubernetes-header"
+                  Kubernetes
+                </h2>
+                <div
+                  data-preference-item-test="kubectl"
+                >
+                  <section
+                    id="kubectl"
                   >
-                    Kubernetes
-                  </h2>
-                  <section>
                     <div
-                      class="SubTitle"
+                      data-preference-item-test="kubectl-binary-download"
                     >
-                      Kubectl binary download
-                       
-                    </div>
-                    <label
-                      class="Switch"
-                      data-testid="switch"
-                    >
-                      Download kubectl binaries matching the Kubernetes cluster version
-                      <input
-                        role="switch"
-                        type="checkbox"
-                      />
-                    </label>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Download mirror
-                       
-                    </div>
-                    <div
-                      class="Select theme-lens Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-download-mirror-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
+                      <section>
                         <div
-                          class="Select__value-container css-319lph-ValueContainer"
+                          class="SubTitle"
                         >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-download-mirror-input-placeholder"
-                          >
-                            Download mirror for kubectl
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-download-mirror-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="download-mirror-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
+                          Kubectl binary download
+                           
                         </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        <label
+                          class="Switch"
+                          data-testid="switch"
                         >
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          Download kubectl binaries matching the Kubernetes cluster version
+                          <input
+                            role="switch"
+                            type="checkbox"
                           />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Directory for binaries
-                       
+                        </label>
+                      </section>
                     </div>
                     <div
-                      class="Input theme round black disabled"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          disabled=""
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
+                      class="size-xl"
+                    />
                     <div
-                      class="hint"
+                      data-preference-item-test="kubectl-download-mirror"
                     >
-                      The directory to download binaries into.
-                    </div>
-                  </section>
-                  <section>
-                    <div
-                      class="SubTitle"
-                    >
-                      Path to kubectl binary
-                       
-                    </div>
-                    <div
-                      class="Input theme round black"
-                    >
-                      <label
-                        class="input-area flex gaps align-center"
-                        id=""
-                      >
-                        <input
-                          class="input box grow"
-                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                          spellcheck="false"
-                          value=""
-                        />
-                      </label>
-                      <div
-                        class="input-info flex gaps"
-                      />
-                    </div>
-                  </section>
-                </section>
-                <hr />
-                <section
-                  id="kube-sync"
-                >
-                  <h2
-                    data-testid="kubernetes-sync-header"
-                  >
-                    Kubeconfig Syncs
-                  </h2>
-                  <div
-                    class="self-start mb-5"
-                  >
-                    <button
-                      class="Button PathPicker primary"
-                      type="button"
-                    >
-                      Sync Files and Folders
-                    </button>
-                  </div>
-                  <div
-                    class="SubTitle pt-5"
-                  >
-                    Synced Items
-                     
-                  </div>
-                  <div
-                    class="notice mt-3"
-                  >
-                    <div
-                      class="flex-grow text-center"
-                    >
-                      No files and folders have been synced yet
-                    </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="helm"
-                >
-                  <h2>
-                    Helm Charts
-                  </h2>
-                  <div>
-                    <div
-                      data-testid="helm-controls"
-                    >
-                      <div
-                        class="flex gaps"
-                      >
+                      <section>
                         <div
-                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          class="SubTitle"
+                        >
+                          Download mirror
+                           
+                        </div>
+                        <div
+                          class="Select theme-lens Select--is-disabled css-3iigni-container"
                         >
                           <span
                             class="css-1f43avz-a11yText-A11yText"
-                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                            id="react-select-download-mirror-input-live-region"
                           />
                           <span
                             aria-atomic="false"
@@ -2140,9 +2183,9 @@ exports[`remove helm repository from list of active repositories in preferences
                             >
                               <div
                                 class="Select__placeholder css-14el2xx-placeholder"
-                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                id="react-select-download-mirror-input-placeholder"
                               >
-                                Repositories
+                                Download mirror for kubectl
                               </div>
                               <div
                                 class="Select__input-container css-jzldcf-Input"
@@ -2150,7 +2193,7 @@ exports[`remove helm repository from list of active repositories in preferences
                               >
                                 <input
                                   aria-autocomplete="list"
-                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-describedby="react-select-download-mirror-input-placeholder"
                                   aria-expanded="false"
                                   aria-haspopup="true"
                                   autocapitalize="none"
@@ -2158,7 +2201,7 @@ exports[`remove helm repository from list of active repositories in preferences
                                   autocorrect="off"
                                   class="Select__input"
                                   disabled=""
-                                  id="selection-of-active-public-helm-repository"
+                                  id="download-mirror-input"
                                   role="combobox"
                                   spellcheck="false"
                                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2171,20 +2214,6 @@ exports[`remove helm repository from list of active repositories in preferences
                             <div
                               class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                             >
-                              <div
-                                aria-hidden="true"
-                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                              >
-                                <span
-                                  class="css-1xtdfmb-LoadingDot"
-                                />
-                                <span
-                                  class="css-zoievk-LoadingDot"
-                                />
-                                <span
-                                  class="css-x748d8-LoadingDot"
-                                />
-                              </div>
                               <span
                                 class="Select__indicator-separator css-109onse-indicatorSeparator"
                               />
@@ -2208,30 +2237,256 @@ exports[`remove helm repository from list of active repositories in preferences
                             </div>
                           </div>
                         </div>
-                        <button
-                          class="Button primary"
-                          data-testid="add-custom-helm-repo-button"
-                          type="button"
-                        >
-                          Add Custom Helm Repo
-                        </button>
-                      </div>
-                      <div
-                        class="repos"
-                      >
+                      </section>
+                    </div>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-directory-for-binaries"
+                    >
+                      <section>
                         <div
-                          class="pt-5 relative"
+                          class="SubTitle"
                         >
+                          Directory for binaries
+                           
+                        </div>
+                        <div
+                          class="Input theme round black disabled"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              disabled=""
+                              placeholder="/some-electron-app-path-for-user-data/binaries"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
                           <div
-                            class="Spinner singleColor center"
-                            data-testid="helm-repositories-are-loading"
+                            class="input-info flex gaps"
                           />
                         </div>
-                      </div>
-                      <div />
+                        <div
+                          class="hint"
+                        >
+                          The directory to download binaries into.
+                        </div>
+                      </section>
                     </div>
-                  </div>
-                </section>
+                    <div
+                      class="size-xl"
+                    />
+                    <div
+                      data-preference-item-test="kubectl-path-to-binary"
+                    >
+                      <section>
+                        <div
+                          class="SubTitle"
+                        >
+                          Path to kubectl binary
+                           
+                        </div>
+                        <div
+                          class="Input theme round black"
+                        >
+                          <label
+                            class="input-area flex gaps align-center"
+                            id=""
+                          >
+                            <input
+                              class="input box grow"
+                              placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                              spellcheck="false"
+                              value=""
+                            />
+                          </label>
+                          <div
+                            class="input-info flex gaps"
+                          />
+                        </div>
+                      </section>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="kubeconfig-sync"
+                >
+                  <section
+                    id="kube-sync"
+                  >
+                    <h2
+                      data-testid="kubernetes-sync-header"
+                    >
+                      Kubeconfig Syncs
+                    </h2>
+                    <div
+                      class="self-start mb-5"
+                    >
+                      <button
+                        class="Button PathPicker primary"
+                        type="button"
+                      >
+                        Sync Files and Folders
+                      </button>
+                    </div>
+                    <div
+                      class="SubTitle pt-5"
+                    >
+                      Synced Items
+                       
+                    </div>
+                    <div
+                      class="notice mt-3"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        No files and folders have been synced yet
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="helm-charts"
+                >
+                  <section
+                    id="helm"
+                  >
+                    <h2>
+                      Helm Charts
+                    </h2>
+                    <div>
+                      <div
+                        data-testid="helm-controls"
+                      >
+                        <div
+                          class="flex gaps"
+                        >
+                          <div
+                            class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                          >
+                            <span
+                              class="css-1f43avz-a11yText-A11yText"
+                              id="react-select-selection-of-active-public-helm-repository-live-region"
+                            />
+                            <span
+                              aria-atomic="false"
+                              aria-live="polite"
+                              aria-relevant="additions text"
+                              class="css-1f43avz-a11yText-A11yText"
+                            />
+                            <div
+                              class="Select__control Select__control--is-disabled css-1insrsq-control"
+                            >
+                              <div
+                                class="Select__value-container css-319lph-ValueContainer"
+                              >
+                                <div
+                                  class="Select__placeholder css-14el2xx-placeholder"
+                                  id="react-select-selection-of-active-public-helm-repository-placeholder"
+                                >
+                                  Repositories
+                                </div>
+                                <div
+                                  class="Select__input-container css-jzldcf-Input"
+                                  data-value=""
+                                >
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                    aria-expanded="false"
+                                    aria-haspopup="true"
+                                    autocapitalize="none"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    class="Select__input"
+                                    disabled=""
+                                    id="selection-of-active-public-helm-repository"
+                                    role="combobox"
+                                    spellcheck="false"
+                                    style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                    tabindex="0"
+                                    type="text"
+                                    value=""
+                                  />
+                                </div>
+                              </div>
+                              <div
+                                class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                              >
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                                >
+                                  <span
+                                    class="css-1xtdfmb-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-zoievk-LoadingDot"
+                                  />
+                                  <span
+                                    class="css-x748d8-LoadingDot"
+                                  />
+                                </div>
+                                <span
+                                  class="Select__indicator-separator css-109onse-indicatorSeparator"
+                                />
+                                <div
+                                  aria-hidden="true"
+                                  class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="css-tj5bde-Svg"
+                                    focusable="false"
+                                    height="20"
+                                    viewBox="0 0 20 20"
+                                    width="20"
+                                  >
+                                    <path
+                                      d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                    />
+                                  </svg>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <button
+                            class="Button primary"
+                            data-testid="add-custom-helm-repo-button"
+                            type="button"
+                          >
+                            Add Custom Helm Repo
+                          </button>
+                        </div>
+                        <div
+                          class="repos"
+                        >
+                          <div
+                            class="pt-5 relative"
+                          >
+                            <div
+                              class="Spinner singleColor center"
+                              data-testid="helm-repositories-are-loading"
+                            />
+                          </div>
+                        </div>
+                        <div />
+                      </div>
+                    </div>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -2316,6 +2571,7 @@ exports[`remove helm repository from list of active repositories in preferences
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts b/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts
index f77a550575..a1b215c40c 100644
--- a/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts
+++ b/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts
@@ -8,24 +8,24 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
+import type { ExecFile } from "../../common/fs/exec-file.injectable";
 import execFileInjectable from "../../common/fs/exec-file.injectable";
 import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable";
 import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
 import type { HelmRepo } from "../../common/helm/helm-repo";
-import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
+import callForPublicHelmRepositoriesInjectable from "./child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
 import isPathInjectable from "../../renderer/components/input/validators/is-path.injectable";
 import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable";
 import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable";
 import type { AsyncResult } from "../../common/utils/async-result";
+import { useFakeTime } from "../../common/test-utils/use-fake-time";
 
 describe("add custom helm repository in preferences", () => {
   let builder: ApplicationBuilder;
   let showSuccessNotificationMock: jest.Mock;
   let showErrorNotificationMock: jest.Mock;
   let rendered: RenderResult;
-  let execFileMock: AsyncFnMock<
-    ReturnType<typeof execFileInjectable["instantiate"]>
-  >;
+  let execFileMock: AsyncFnMock<ExecFile>;
   let getActiveHelmRepositoriesMock: AsyncFnMock<() => Promise<AsyncResult<HelmRepo[]>>>;
 
   beforeEach(async () => {
@@ -33,6 +33,8 @@ describe("add custom helm repository in preferences", () => {
 
     builder = getApplicationBuilder();
 
+    useFakeTime("2021-01-01 12:00:00");
+
     execFileMock = asyncFn();
     getActiveHelmRepositoriesMock = asyncFn();
     showSuccessNotificationMock = jest.fn();
@@ -167,7 +169,10 @@ describe("add custom helm repository in preferences", () => {
               expect(execFileMock).toHaveBeenCalledWith(
                 "some-helm-binary-path",
                 ["repo", "add", "some-custom-repository", "http://some.url"],
-                { "maxBuffer": 34359738368 },
+                {
+                  maxBuffer: 34359738368,
+                  env: {},
+                },
               );
             });
 
@@ -181,9 +186,12 @@ describe("add custom helm repository in preferences", () => {
 
             describe("when activation rejects", () => {
               beforeEach(async () => {
-                await execFileMock.reject(
-                  "Some error",
-                );
+                await execFileMock.resolve({
+                  callWasSuccessful: false,
+                  error: Object.assign(new Error("Some error"), {
+                    stderr: "",
+                  }),
+                });
               });
 
               it("renders", () => {
@@ -216,8 +224,10 @@ describe("add custom helm repository in preferences", () => {
                     "some-helm-binary-path",
                     ["repo", "add", "some-custom-repository", "http://some.url"],
                   ],
-
-                  "",
+                  {
+                    callWasSuccessful: true,
+                    response: "",
+                  },
                 );
               });
 
@@ -366,7 +376,10 @@ describe("add custom helm repository in preferences", () => {
                     "--cert-file",
                     "some-cert-file",
                   ],
-                  { "maxBuffer": 34359738368 },
+                  {
+                    maxBuffer: 34359738368,
+                    env: {},
+                  },
                 );
               });
             });
diff --git a/src/features/helm-charts/add-helm-repository-from-list-in-preferences.test.ts b/src/features/helm-charts/add-helm-repository-from-list-in-preferences.test.ts
index 98e94321bd..29e6ea890d 100644
--- a/src/features/helm-charts/add-helm-repository-from-list-in-preferences.test.ts
+++ b/src/features/helm-charts/add-helm-repository-from-list-in-preferences.test.ts
@@ -7,11 +7,12 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
+import type { ExecFile } from "../../common/fs/exec-file.injectable";
 import execFileInjectable from "../../common/fs/exec-file.injectable";
 import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable";
 import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
 import type { HelmRepo } from "../../common/helm/helm-repo";
-import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
+import callForPublicHelmRepositoriesInjectable from "./child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
 import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable";
 import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable";
 import type { AsyncResult } from "../../common/utils/async-result";
@@ -21,9 +22,7 @@ describe("add helm repository from list in preferences", () => {
   let showSuccessNotificationMock: jest.Mock;
   let showErrorNotificationMock: jest.Mock;
   let rendered: RenderResult;
-  let execFileMock: AsyncFnMock<
-    ReturnType<typeof execFileInjectable["instantiate"]>
-  >;
+  let execFileMock: AsyncFnMock<ExecFile>;
   let getActiveHelmRepositoriesMock: AsyncFnMock<() => Promise<AsyncResult<HelmRepo[]>>>;
   let callForPublicHelmRepositoriesMock: AsyncFnMock<() => Promise<HelmRepo[]>>;
 
@@ -119,7 +118,10 @@ describe("add helm repository from list in preferences", () => {
             expect(execFileMock).toHaveBeenCalledWith(
               "some-helm-binary-path",
               ["repo", "add", "Some to be added repository", "some-other-url"],
-              { "maxBuffer": 34359738368 },
+              {
+                maxBuffer: 34359738368,
+                env: {},
+              },
             );
           });
 
@@ -129,9 +131,12 @@ describe("add helm repository from list in preferences", () => {
 
           describe("when adding rejects", () => {
             beforeEach(async () => {
-              await execFileMock.reject(
-                "Some error",
-              );
+              await execFileMock.resolve({
+                callWasSuccessful: false,
+                error: Object.assign(new Error("Some error"), {
+                  stderr: "",
+                }),
+              });
             });
 
             it("renders", () => {
@@ -164,8 +169,10 @@ describe("add helm repository from list in preferences", () => {
                   "some-helm-binary-path",
                   ["repo", "add", "Some to be added repository", "some-other-url"],
                 ],
-
-                "",
+                {
+                  callWasSuccessful: true,
+                  response: "",
+                },
               );
             });
 
@@ -228,7 +235,10 @@ describe("add helm repository from list in preferences", () => {
                     expect(execFileMock).toHaveBeenCalledWith(
                       "some-helm-binary-path",
                       ["repo", "remove", "Some already active repository"],
-                      { "maxBuffer": 34359738368 },
+                      {
+                        maxBuffer: 34359738368,
+                        env: {},
+                      },
                     );
                   });
 
@@ -243,8 +253,10 @@ describe("add helm repository from list in preferences", () => {
                           "some-helm-binary-path",
                           ["repo", "remove", "Some already active repository"],
                         ],
-
-                        "",
+                        {
+                          callWasSuccessful: true,
+                          response: "",
+                        },
                       );
                     });
 
diff --git a/src/features/helm-charts/child-features/preferences/renderer/active-helm-repositories.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/active-helm-repositories.injectable.ts
new file mode 100644
index 0000000000..7a0d5e6b47
--- /dev/null
+++ b/src/features/helm-charts/child-features/preferences/renderer/active-helm-repositories.injectable.ts
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { asyncComputed } from "@ogre-tools/injectable-react";
+import { getActiveHelmRepositoriesChannel } from "../../../../../common/helm/get-active-helm-repositories-channel";
+import { requestFromChannelInjectionToken } from "../../../../../common/utils/channel/request-from-channel-injection-token";
+import showErrorNotificationInjectable from "../../../../../renderer/components/notifications/show-error-notification.injectable";
+import helmRepositoriesErrorStateInjectable from "./helm-repositories-error-state.injectable";
+import { runInAction } from "mobx";
+
+const activeHelmRepositoriesInjectable = getInjectable({
+  id: "active-helm-repositories",
+
+  instantiate: (di) => {
+    const requestFromChannel = di.inject(requestFromChannelInjectionToken);
+    const showErrorNotification = di.inject(showErrorNotificationInjectable);
+    const helmRepositoriesErrorState = di.inject(
+      helmRepositoriesErrorStateInjectable,
+    );
+
+    return asyncComputed({
+      getValueFromObservedPromise: async () => {
+        const result = await requestFromChannel(
+          getActiveHelmRepositoriesChannel,
+        );
+
+        if (result.callWasSuccessful) {
+          return result.response;
+        } else {
+          showErrorNotification(result.error);
+
+          runInAction(() =>
+            helmRepositoriesErrorState.set({
+              controlsAreShown: false,
+              errorMessage: result.error,
+            }),
+          );
+
+          return [];
+        }
+      },
+
+      valueWhenPending: [],
+    });
+  },
+});
+
+export default activeHelmRepositoriesInjectable;
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/add-helm-repo-dialog.scss b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/add-helm-repo-dialog.scss
similarity index 100%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/add-helm-repo-dialog.scss
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/add-helm-repo-dialog.scss
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog-content.tsx b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog-content.tsx
similarity index 90%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog-content.tsx
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog-content.tsx
index 091dce407f..005dcace98 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog-content.tsx
+++ b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog-content.tsx
@@ -6,9 +6,9 @@
 import "./add-helm-repo-dialog.scss";
 
 import React from "react";
-import { Wizard, WizardStep } from "../../../../wizard";
-import { Input } from "../../../../input";
-import { systemName, isUrl } from "../../../../input/input_validators";
+import { Wizard, WizardStep } from "../../../../../../renderer/components/wizard";
+import { Input } from "../../../../../../renderer/components/input";
+import { isUrl, systemName } from "../../../../../../renderer/components/input/input_validators";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import customHelmRepoInjectable from "./custom-helm-repo.injectable";
 import type { HelmRepo } from "../../../../../../common/helm/helm-repo";
@@ -17,11 +17,11 @@ import type { IObservableValue } from "mobx";
 import { action } from "mobx";
 import submitCustomHelmRepositoryInjectable from "./submit-custom-helm-repository.injectable";
 import hideDialogForAddingCustomHelmRepositoryInjectable from "./dialog-visibility/hide-dialog-for-adding-custom-helm-repository.injectable";
-import { Button } from "../../../../button";
-import { Icon } from "../../../../icon";
+import { Button } from "../../../../../../renderer/components/button";
+import { Icon } from "../../../../../../renderer/components/icon";
 import maximalCustomHelmRepoOptionsAreShownInjectable from "./maximal-custom-helm-repo-options-are-shown.injectable";
-import { SubTitle } from "../../../../layout/sub-title";
-import { Checkbox } from "../../../../checkbox";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { Checkbox } from "../../../../../../renderer/components/checkbox";
 import { HelmFileInput } from "./helm-file-input/helm-file-input";
 
 interface Dependencies {
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx
similarity index 95%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx
index 3c6a2da9a4..2f57b143a4 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx
+++ b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx
@@ -6,7 +6,7 @@
 import "./add-helm-repo-dialog.scss";
 
 import React from "react";
-import { Dialog } from "../../../../dialog";
+import { Dialog } from "../../../../../../renderer/components/dialog";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import { AddingOfCustomHelmRepositoryDialogContent } from "./adding-of-custom-helm-repository-dialog-content";
 import addingOfCustomHelmRepositoryDialogIsVisibleInjectable from "./dialog-visibility/adding-of-custom-helm-repository-dialog-is-visible.injectable";
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx
similarity index 92%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx
index 99f16a83ed..d81dfbe4c9 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx
+++ b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx
@@ -4,7 +4,7 @@
  */
 import { withInjectables } from "@ogre-tools/injectable-react";
 import React from "react";
-import { Button } from "../../../../button";
+import { Button } from "../../../../../../renderer/components/button";
 import showDialogForAddingCustomHelmRepositoryInjectable from "./dialog-visibility/show-dialog-for-adding-custom-helm-repository.injectable";
 
 interface Dependencies {
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/custom-helm-repo.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/custom-helm-repo.injectable.ts
similarity index 100%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/custom-helm-repo.injectable.ts
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/custom-helm-repo.injectable.ts
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/adding-of-custom-helm-repository-dialog-is-visible.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/dialog-visibility/adding-of-custom-helm-repository-dialog-is-visible.injectable.ts
similarity index 100%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/adding-of-custom-helm-repository-dialog-is-visible.injectable.ts
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/dialog-visibility/adding-of-custom-helm-repository-dialog-is-visible.injectable.ts
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/hide-dialog-for-adding-custom-helm-repository.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/dialog-visibility/hide-dialog-for-adding-custom-helm-repository.injectable.ts
similarity index 100%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/hide-dialog-for-adding-custom-helm-repository.injectable.ts
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/dialog-visibility/hide-dialog-for-adding-custom-helm-repository.injectable.ts
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/show-dialog-for-adding-custom-helm-repository.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/dialog-visibility/show-dialog-for-adding-custom-helm-repository.injectable.ts
similarity index 100%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/show-dialog-for-adding-custom-helm-repository.injectable.ts
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/dialog-visibility/show-dialog-for-adding-custom-helm-repository.injectable.ts
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable.ts
similarity index 97%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable.ts
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable.ts
index 7ae1854770..7a20ebf439 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable.ts
+++ b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import type { FileFilter } from "electron";
-import { requestOpenFilePickingDialog } from "../../../../../../ipc";
+import { requestOpenFilePickingDialog } from "../../../../../../../renderer/ipc";
 
 const getFilePathsInjectable = getInjectable({
   id: "get-file-paths",
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/helm-file-input.tsx b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/helm-file-input/helm-file-input.tsx
similarity index 83%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/helm-file-input.tsx
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/helm-file-input/helm-file-input.tsx
index 0b2bc7453b..6a8a893c1f 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/helm-file-input.tsx
+++ b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/helm-file-input/helm-file-input.tsx
@@ -2,14 +2,14 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { InputValidator } from "../../../../../input";
-import { Input } from "../../../../../input";
-import { Icon } from "../../../../../icon";
+import type { InputValidator } from "../../../../../../../renderer/components/input";
+import { Input } from "../../../../../../../renderer/components/input";
+import { Icon } from "../../../../../../../renderer/components/icon";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import React from "react";
 import getFilePathsInjectable from "./get-file-paths.injectable";
 import type { FileFilter } from "electron";
-import isPathInjectable from "../../../../../input/validators/is-path.injectable";
+import isPathInjectable from "../../../../../../../renderer/components/input/validators/is-path.injectable";
 
 interface HelmFileInputProps {
   placeholder: string;
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/maximal-custom-helm-repo-options-are-shown.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/maximal-custom-helm-repo-options-are-shown.injectable.ts
similarity index 100%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/maximal-custom-helm-repo-options-are-shown.injectable.ts
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/maximal-custom-helm-repo-options-are-shown.injectable.ts
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/submit-custom-helm-repository.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/submit-custom-helm-repository.injectable.ts
similarity index 100%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/submit-custom-helm-repository.injectable.ts
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/submit-custom-helm-repository.injectable.ts
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx b/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx
similarity index 92%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx
index 3c555823c9..6b6cfeedd4 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx
+++ b/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx
@@ -7,9 +7,9 @@ import { withInjectables } from "@ogre-tools/injectable-react";
 import React from "react";
 import publicHelmRepositoriesInjectable from "./public-helm-repositories/public-helm-repositories.injectable";
 import type { HelmRepo } from "../../../../../../common/helm/helm-repo";
-import type { SelectOption } from "../../../../select";
-import { Select } from "../../../../select";
-import { Icon } from "../../../../icon";
+import type { SelectOption } from "../../../../../../renderer/components/select";
+import { Select } from "../../../../../../renderer/components/select";
+import { Icon } from "../../../../../../renderer/components/icon";
 import { observer } from "mobx-react";
 import type { SingleValue } from "react-select";
 import selectHelmRepositoryInjectable from "./select-helm-repository/select-helm-repository.injectable";
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable.ts
similarity index 100%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable.ts
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable.ts
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/public-helm-repositories.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/public-helm-repositories.injectable.ts
similarity index 83%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/public-helm-repositories.injectable.ts
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/public-helm-repositories.injectable.ts
index 08556af71c..4c32ff7154 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/public-helm-repositories.injectable.ts
+++ b/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/public-helm-repositories.injectable.ts
@@ -12,9 +12,10 @@ const publicHelmRepositoriesInjectable = getInjectable({
   instantiate: (di) => {
     const callForPublicHelmRepositories = di.inject(callForPublicHelmRepositoriesInjectable);
 
-    return asyncComputed(async () => {
-      return await callForPublicHelmRepositories();
-    }, []);
+    return asyncComputed({
+      getValueFromObservedPromise: callForPublicHelmRepositories,
+      valueWhenPending: [],
+    });
   },
 });
 
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts
similarity index 76%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts
index 50e02f4235..6b39d8dddf 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts
+++ b/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts
@@ -3,19 +3,18 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import addHelmRepositoryChannelInjectable from "../../../../../../../common/helm/add-helm-repository-channel.injectable";
 import type { HelmRepo } from "../../../../../../../common/helm/helm-repo";
 import { requestFromChannelInjectionToken } from "../../../../../../../common/utils/channel/request-from-channel-injection-token";
 import activeHelmRepositoriesInjectable from "../../active-helm-repositories.injectable";
-import showErrorNotificationInjectable from "../../../../../notifications/show-error-notification.injectable";
-import showSuccessNotificationInjectable from "../../../../../notifications/show-success-notification.injectable";
+import showErrorNotificationInjectable from "../../../../../../../renderer/components/notifications/show-error-notification.injectable";
+import showSuccessNotificationInjectable from "../../../../../../../renderer/components/notifications/show-success-notification.injectable";
+import { addHelmRepositoryChannel } from "../../../../../../../common/helm/add-helm-repository-channel";
 
 const addHelmRepositoryInjectable = getInjectable({
   id: "add-public-helm-repository",
 
   instantiate: (di) => {
     const requestFromChannel = di.inject(requestFromChannelInjectionToken);
-    const addHelmRepositoryChannel = di.inject(addHelmRepositoryChannelInjectable);
     const activeHelmRepositories = di.inject(activeHelmRepositoriesInjectable);
     const showErrorNotification = di.inject(showErrorNotificationInjectable);
     const showSuccessNotification = di.inject(showSuccessNotificationInjectable);
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts
similarity index 92%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts
rename to src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts
index 8128f39a47..a33f9c39ca 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts
+++ b/src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import addHelmRepositoryInjectable from "./add-helm-repository.injectable";
-import type { SelectOption } from "../../../../../select";
+import type { SelectOption } from "../../../../../../../renderer/components/select";
 import type { HelmRepo } from "../../../../../../../common/helm/helm-repo";
 import type { SingleValue } from "react-select";
 import removeHelmRepositoryInjectable from "../../remove-helm-repository.injectable";
diff --git a/src/features/helm-charts/child-features/preferences/renderer/helm-charts-preference-block.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/helm-charts-preference-block.injectable.ts
new file mode 100644
index 0000000000..e9beba4eb9
--- /dev/null
+++ b/src/features/helm-charts/child-features/preferences/renderer/helm-charts-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { HelmCharts } from "./helm-charts";
+import { preferenceItemInjectionToken } from "../../../../preferences/renderer/preference-items/preference-item-injection-token";
+
+const helmChartsPreferenceBlockInjectable = getInjectable({
+  id: "helm-charts-preference-block",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "helm-charts",
+    parentId: "kubernetes-page",
+    orderNumber: 30,
+    Component: HelmCharts,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default helmChartsPreferenceBlockInjectable;
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts.module.scss b/src/features/helm-charts/child-features/preferences/renderer/helm-charts.module.scss
similarity index 100%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts.module.scss
rename to src/features/helm-charts/child-features/preferences/renderer/helm-charts.module.scss
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts.tsx b/src/features/helm-charts/child-features/preferences/renderer/helm-charts.tsx
similarity index 67%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts.tsx
rename to src/features/helm-charts/child-features/preferences/renderer/helm-charts.tsx
index 691d618061..3fd3c6718b 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts.tsx
+++ b/src/features/helm-charts/child-features/preferences/renderer/helm-charts.tsx
@@ -14,7 +14,7 @@ import type { HelmRepositoriesErrorState } from "./helm-repositories-error-state
 import helmRepositoriesErrorStateInjectable from "./helm-repositories-error-state.injectable";
 import type { IObservableValue } from "mobx";
 import { observer } from "mobx-react";
-import { Notice } from "../../../+extensions/notice";
+import { Notice } from "../../../../../renderer/components/+extensions/notice";
 
 interface Dependencies {
   helmRepositoriesErrorState: IObservableValue<HelmRepositoriesErrorState>;
@@ -25,27 +25,31 @@ const NonInjectedHelmCharts = observer(
     const state = helmRepositoriesErrorState.get();
 
     return (
-      <div>
-        {!state.controlsAreShown && (
-          <Notice>
-            <div className="flex-grow text-center">{state.errorMessage}</div>
-          </Notice>
-        )}
+      <section id="helm">
+        <h2>Helm Charts</h2>
 
-        {state.controlsAreShown && (
-          <div data-testid="helm-controls">
-            <div className="flex gaps">
-              <AddingOfPublicHelmRepository />
+        <div>
+          {!state.controlsAreShown && (
+            <Notice>
+              <div className="flex-grow text-center">{state.errorMessage}</div>
+            </Notice>
+          )}
 
-              <AddingOfCustomHelmRepositoryOpenButton />
+          {state.controlsAreShown && (
+            <div data-testid="helm-controls">
+              <div className="flex gaps">
+                <AddingOfPublicHelmRepository />
+
+                <AddingOfCustomHelmRepositoryOpenButton />
+              </div>
+
+              <HelmRepositories />
+
+              <AddingOfCustomHelmRepositoryDialog />
             </div>
-
-            <HelmRepositories />
-
-            <AddingOfCustomHelmRepositoryDialog />
-          </div>
-        )}
-      </div>
+          )}
+        </div>
+      </section>
     );
   },
 );
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories-error-state.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/helm-repositories-error-state.injectable.ts
similarity index 100%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories-error-state.injectable.ts
rename to src/features/helm-charts/child-features/preferences/renderer/helm-repositories-error-state.injectable.ts
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories.tsx b/src/features/helm-charts/child-features/preferences/renderer/helm-repositories.tsx
similarity index 92%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories.tsx
rename to src/features/helm-charts/child-features/preferences/renderer/helm-repositories.tsx
index d48f648e89..fd3cd333d8 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories.tsx
+++ b/src/features/helm-charts/child-features/preferences/renderer/helm-repositories.tsx
@@ -11,9 +11,9 @@ import { observer } from "mobx-react";
 import activeHelmRepositoriesInjectable from "./active-helm-repositories.injectable";
 import type { IAsyncComputed } from "@ogre-tools/injectable-react";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import { Spinner } from "../../../spinner";
+import { Spinner } from "../../../../../renderer/components/spinner";
 import type { HelmRepo } from "../../../../../common/helm/helm-repo";
-import { RemovableItem } from "../../removable-item";
+import { RemovableItem } from "../../../../preferences/renderer/removable-item/removable-item";
 import removeHelmRepositoryInjectable from "./remove-helm-repository.injectable";
 
 interface Dependencies {
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/remove-helm-repository.injectable.ts
similarity index 82%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.injectable.ts
rename to src/features/helm-charts/child-features/preferences/renderer/remove-helm-repository.injectable.ts
index 4f316baed0..3aa56a4b04 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.injectable.ts
+++ b/src/features/helm-charts/child-features/preferences/renderer/remove-helm-repository.injectable.ts
@@ -6,14 +6,13 @@ import { getInjectable } from "@ogre-tools/injectable";
 import type { HelmRepo } from "../../../../../common/helm/helm-repo";
 import { requestFromChannelInjectionToken } from "../../../../../common/utils/channel/request-from-channel-injection-token";
 import activeHelmRepositoriesInjectable from "./active-helm-repositories.injectable";
-import removeHelmRepositoryChannelInjectable from "../../../../../common/helm/remove-helm-repository-channel.injectable";
+import { removeHelmRepositoryChannel } from "../../../../../common/helm/remove-helm-repository-channel";
 
 const removePublicHelmRepositoryInjectable = getInjectable({
   id: "remove-public-helm-repository",
 
   instantiate: (di) => {
     const requestFromChannel = di.inject(requestFromChannelInjectionToken);
-    const removeHelmRepositoryChannel = di.inject(removeHelmRepositoryChannelInjectable);
     const activeHelmRepositories = di.inject(activeHelmRepositoriesInjectable);
 
     return async (repository: HelmRepo) => {
diff --git a/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap b/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap
index 15c98bdca1..8a3f4f094c 100644
--- a/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap
+++ b/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap
@@ -2010,6 +2010,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -2019,7 +2020,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -2765,6 +2768,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -2774,7 +2778,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -3065,7 +3071,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
     </div>
   </div>
   <div
-    class="Select__menu-portal css-yj2v5g"
+    class="Select__menu-portal css-1no2yl0-MenuPortal"
   >
     <div
       class="theme-outlined install-chart-version-select-for-some-first-tab-id-options Select__menu css-26l3qy-menu"
@@ -3764,6 +3770,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -3773,7 +3780,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -4737,6 +4746,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -4746,7 +4756,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -5705,6 +5717,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -5714,7 +5727,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -6673,6 +6688,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -6682,7 +6698,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -7663,6 +7681,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -7672,7 +7691,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -7963,7 +7984,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
     </div>
   </div>
   <div
-    class="Select__menu-portal css-yj2v5g"
+    class="Select__menu-portal css-1no2yl0-MenuPortal"
   >
     <div
       class="NamespaceSelectMenu theme-outlined install-chart-namespace-select-for-some-first-tab-id-options Select__menu css-26l3qy-menu"
@@ -8662,6 +8683,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -8671,7 +8693,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -9630,6 +9654,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -9639,7 +9664,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -10653,6 +10680,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -10662,7 +10690,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -12261,6 +12291,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -12270,7 +12301,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -13109,6 +13142,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -13118,7 +13152,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -14323,6 +14359,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -14332,7 +14369,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -14372,6 +14411,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-second-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -14381,7 +14421,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-second-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -15127,6 +15169,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -15136,7 +15179,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -15176,6 +15221,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-second-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -15185,7 +15231,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-second-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -16146,6 +16194,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -16155,7 +16204,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -16195,6 +16246,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-second-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -16204,7 +16256,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-second-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -17163,6 +17217,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -17172,7 +17227,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -18131,6 +18188,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -18140,7 +18198,9 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap b/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap
index c0359c4b88..ea4fa6fc90 100644
--- a/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap
+++ b/src/features/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap
@@ -430,6 +430,7 @@ exports[`installing helm chart from previously opened tab given tab for installi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -439,7 +440,9 @@ exports[`installing helm chart from previously opened tab given tab for installi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -947,6 +950,7 @@ exports[`installing helm chart from previously opened tab given tab for installi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-first-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -956,7 +960,9 @@ exports[`installing helm chart from previously opened tab given tab for installi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-first-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap b/src/features/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap
index a7fcf85592..8acd19726f 100644
--- a/src/features/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap
+++ b/src/features/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap
@@ -434,14 +434,8 @@ exports[`opening dock tab for installing helm chart given application is started
                     </div>
                   </div>
                   <div
-                    class="NoItems flex box grow"
-                  >
-                    <div
-                      class="box center"
-                    >
-                      Item list is empty
-                    </div>
-                  </div>
+                    class="Spinner singleColor center"
+                  />
                 </div>
                 <div
                   class="AddRemoveButtons flex gaps"
@@ -2779,7 +2773,11 @@ exports[`opening dock tab for installing helm chart given application is started
                 </span>
                 <span
                   class="value"
-                />
+                >
+                  <li>
+                    Some Foo&lt;some@foo.com&gt;
+                  </li>
+                </span>
               </div>
             </div>
           </div>
@@ -3682,7 +3680,11 @@ exports[`opening dock tab for installing helm chart given application is started
                 </span>
                 <span
                   class="value"
-                />
+                >
+                  <li>
+                    Some Foo&lt;some@foo.com&gt;
+                  </li>
+                </span>
               </div>
             </div>
           </div>
@@ -4595,7 +4597,11 @@ exports[`opening dock tab for installing helm chart given application is started
                 </span>
                 <span
                   class="value"
-                />
+                >
+                  <li>
+                    Some Foo&lt;some@foo.com&gt;
+                  </li>
+                </span>
               </div>
             </div>
           </div>
@@ -5498,7 +5504,11 @@ exports[`opening dock tab for installing helm chart given application is started
                 </span>
                 <span
                   class="value"
-                />
+                >
+                  <li>
+                    Some Foo&lt;some@foo.com&gt;
+                  </li>
+                </span>
               </div>
             </div>
           </div>
@@ -6194,6 +6204,7 @@ exports[`opening dock tab for installing helm chart given application is started
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -6203,7 +6214,9 @@ exports[`opening dock tab for installing helm chart given application is started
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts b/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts
index f86471e897..9d6c43790d 100644
--- a/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts
+++ b/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts
@@ -8,98 +8,56 @@ import type { RenderResult } from "@testing-library/react";
 import { fireEvent } from "@testing-library/react";
 import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
-import type { CallForHelmCharts } from "../../../renderer/components/+helm-charts/helm-charts/call-for-helm-charts.injectable";
-import callForHelmChartsInjectable from "../../../renderer/components/+helm-charts/helm-charts/call-for-helm-charts.injectable";
 import { HelmChart } from "../../../common/k8s-api/endpoints/helm-charts.api";
 import getRandomInstallChartTabIdInjectable from "../../../renderer/components/dock/install-chart/get-random-install-chart-tab-id.injectable";
-import type { CallForHelmChartValues } from "../../../renderer/components/dock/install-chart/chart-data/call-for-helm-chart-values.injectable";
-import callForHelmChartValuesInjectable from "../../../renderer/components/dock/install-chart/chart-data/call-for-helm-chart-values.injectable";
-import type { CallForCreateHelmRelease } from "../../../renderer/components/+helm-releases/create-release/call-for-create-helm-release.injectable";
-import callForCreateHelmReleaseInjectable from "../../../renderer/components/+helm-releases/create-release/call-for-create-helm-release.injectable";
+import type { RequestCreateHelmRelease } from "../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable";
+import requestCreateHelmReleaseInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable";
 import currentPathInjectable from "../../../renderer/routes/current-path.injectable";
-import namespaceStoreInjectable from "../../../renderer/components/+namespaces/store.injectable";
-import type { NamespaceStore } from "../../../renderer/components/+namespaces/store";
-import type { CallForHelmChartReadme } from "../../../renderer/components/+helm-charts/details/readme/call-for-helm-chart-readme.injectable";
-import callForHelmChartReadmeInjectable from "../../../renderer/components/+helm-charts/details/readme/call-for-helm-chart-readme.injectable";
-import type { CallForHelmChartVersions } from "../../../renderer/components/+helm-charts/details/versions/call-for-helm-chart-versions.injectable";
-import callForHelmChartVersionsInjectable from "../../../renderer/components/+helm-charts/details/versions/call-for-helm-chart-versions.injectable";
 import writeJsonFileInjectable from "../../../common/fs/write-json-file.injectable";
 import directoryForLensLocalStorageInjectable from "../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable";
-import hostedClusterIdInjectable from "../../../renderer/cluster-frame-context/hosted-cluster-id.injectable";
 import dockStoreInjectable from "../../../renderer/components/dock/dock/store.injectable";
 import readJsonFileInjectable from "../../../common/fs/read-json-file.injectable";
 import type { DiContainer } from "@ogre-tools/injectable";
-import callForHelmReleasesInjectable from "../../../renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.injectable";
-import callForHelmReleaseDetailsInjectable from "../../../renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release-details/call-for-helm-release-details.injectable";
+import type { RequestHelmCharts } from "../../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable";
+import type { RequestHelmChartVersions } from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable";
+import type { RequestHelmChartReadme } from "../../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable";
+import type { RequestHelmChartValues } from "../../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable";
+import requestHelmChartsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable";
+import requestHelmChartVersionsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable";
+import requestHelmChartReadmeInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable";
+import requestHelmChartValuesInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable";
+import type { RequestDetailedHelmRelease } from "../../../renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable";
+import requestDetailedHelmReleaseInjectable from "../../../renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable";
 
 describe("installing helm chart from new tab", () => {
   let builder: ApplicationBuilder;
-  let callForHelmChartsMock: AsyncFnMock<CallForHelmCharts>;
-  let callForHelmChartVersionsMock: AsyncFnMock<CallForHelmChartVersions>;
-  let callForHelmChartReadmeMock: AsyncFnMock<CallForHelmChartReadme>;
-  let callForHelmChartValuesMock: AsyncFnMock<CallForHelmChartValues>;
-  let callForCreateHelmReleaseMock: AsyncFnMock<CallForCreateHelmRelease>;
+  let requestDetailedHelmReleaseMock: AsyncFnMock<RequestDetailedHelmRelease>;
+  let requestHelmChartsMock: AsyncFnMock<RequestHelmCharts>;
+  let requestHelmChartVersionsMock: AsyncFnMock<RequestHelmChartVersions>;
+  let requestHelmChartReadmeMock: AsyncFnMock<RequestHelmChartReadme>;
+  let requestHelmChartValuesMock: AsyncFnMock<RequestHelmChartValues>;
+  let requestCreateHelmReleaseMock: AsyncFnMock<RequestCreateHelmRelease>;
 
   beforeEach(() => {
     builder = getApplicationBuilder();
 
     builder.setEnvironmentToClusterFrame();
 
-    callForHelmChartsMock = asyncFn();
-    callForHelmChartVersionsMock = asyncFn();
-    callForHelmChartReadmeMock = asyncFn();
-    callForHelmChartValuesMock = asyncFn();
-    callForCreateHelmReleaseMock = asyncFn();
+    requestDetailedHelmReleaseMock = asyncFn();
+    requestHelmChartsMock = asyncFn();
+    requestHelmChartVersionsMock = asyncFn();
+    requestHelmChartReadmeMock = asyncFn();
+    requestHelmChartValuesMock = asyncFn();
+    requestCreateHelmReleaseMock = asyncFn();
 
     builder.beforeWindowStart((windowDi) => {
-      windowDi.override(callForHelmReleasesInjectable, () => async () => []);
-      windowDi.override(callForHelmReleaseDetailsInjectable, () => () => new Promise(() => {}));
-
-      windowDi.override(
-        directoryForLensLocalStorageInjectable,
-        () => "/some-directory-for-lens-local-storage",
-      );
-
-      windowDi.override(hostedClusterIdInjectable, () => "some-cluster-id");
-
-      windowDi.override(
-        callForHelmChartsInjectable,
-        () => callForHelmChartsMock,
-      );
-
-      windowDi.override(
-        callForHelmChartVersionsInjectable,
-        () => callForHelmChartVersionsMock,
-      );
-
-      windowDi.override(
-        callForHelmChartReadmeInjectable,
-        () => callForHelmChartReadmeMock,
-      );
-
-      windowDi.override(
-        callForHelmChartValuesInjectable,
-        () => callForHelmChartValuesMock,
-      );
-
-      windowDi.override(
-        callForCreateHelmReleaseInjectable,
-        () => callForCreateHelmReleaseMock,
-      );
-
-      // TODO: Replace store mocking with mock for the actual side-effect (where the namespaces are coming from)
-      windowDi.override(
-        namespaceStoreInjectable,
-        () =>
-          ({
-            contextNamespaces: [],
-            items: [
-              { getName: () => "default" },
-              { getName: () => "some-other-namespace" },
-            ],
-            selectNamespaces: () => {},
-          } as unknown as NamespaceStore),
-      );
+      windowDi.override(directoryForLensLocalStorageInjectable, () => "/some-directory-for-lens-local-storage");
+      windowDi.override(requestDetailedHelmReleaseInjectable, () => requestDetailedHelmReleaseMock);
+      windowDi.override(requestHelmChartsInjectable, () => requestHelmChartsMock);
+      windowDi.override(requestHelmChartVersionsInjectable, () => requestHelmChartVersionsMock);
+      windowDi.override(requestHelmChartReadmeInjectable, () => requestHelmChartReadmeMock);
+      windowDi.override(requestHelmChartValuesInjectable, () => requestHelmChartValuesMock);
+      windowDi.override(requestCreateHelmReleaseInjectable, () => requestCreateHelmReleaseMock);
 
       windowDi.override(getRandomInstallChartTabIdInjectable, () =>
         jest
@@ -108,6 +66,9 @@ describe("installing helm chart from new tab", () => {
           .mockReturnValueOnce("some-second-tab-id"),
       );
     });
+
+    builder.namespaces.add("default");
+    builder.namespaces.add("some-other-namespace");
   });
 
   describe("given tab for installing chart was not previously opened and application is started", () => {
@@ -136,7 +97,6 @@ describe("installing helm chart from new tab", () => {
 
       // TODO: Make TerminalWindow unit testable to allow realistic behaviour
       dockStore.closeTab("terminal");
-
     });
 
     it("renders", () => {
@@ -144,14 +104,13 @@ describe("installing helm chart from new tab", () => {
     });
 
     describe("when navigating to helm charts", () => {
-
       beforeEach(async () => {
         builder.helmCharts.navigate({
           chartName: "some-name",
           repo: "some-repository",
         });
 
-        await callForHelmChartsMock.resolve([
+        await requestHelmChartsMock.resolve([
           HelmChart.create({
             apiVersion: "some-api-version",
             name: "some-name",
@@ -185,7 +144,7 @@ describe("installing helm chart from new tab", () => {
           }),
         ]);
 
-        await callForHelmChartVersionsMock.resolve([
+        await requestHelmChartVersionsMock.resolve([
           HelmChart.create({
             apiVersion: "some-api-version",
             name: "some-name",
@@ -219,7 +178,7 @@ describe("installing helm chart from new tab", () => {
           }),
         ]);
 
-        await callForHelmChartReadmeMock.resolve("some-readme");
+        await requestHelmChartReadmeMock.resolve("some-readme");
       });
 
       it("renders", () => {
@@ -228,7 +187,7 @@ describe("installing helm chart from new tab", () => {
 
       describe("when selecting to install the chart", () => {
         beforeEach(() => {
-          callForHelmChartVersionsMock.mockClear();
+          requestHelmChartVersionsMock.mockClear();
 
           const installButton = rendered.getByTestId(
             "install-chart-for-some-repository-some-name",
@@ -248,7 +207,7 @@ describe("installing helm chart from new tab", () => {
         });
 
         it("calls for default configuration of the chart", () => {
-          expect(callForHelmChartValuesMock).toHaveBeenCalledWith(
+          expect(requestHelmChartValuesMock).toHaveBeenCalledWith(
             "some-repository",
             "some-name",
             "some-version",
@@ -256,7 +215,7 @@ describe("installing helm chart from new tab", () => {
         });
 
         it("calls for available versions", () => {
-          expect(callForHelmChartVersionsMock).toHaveBeenCalledWith(
+          expect(requestHelmChartVersionsMock).toHaveBeenCalledWith(
             "some-repository",
             "some-name",
           );
@@ -268,18 +227,8 @@ describe("installing helm chart from new tab", () => {
           ).toBeInTheDocument();
         });
 
-        it("given default configuration resolves but versions have not resolved yet, still shows the spinner", async () => {
-          await callForHelmChartValuesMock.resolve(
-            "some-default-configuration",
-          );
-
-          expect(
-            rendered.getByTestId("install-chart-tab-spinner"),
-          ).toBeInTheDocument();
-        });
-
         it("given versions resolve but default configuration has not resolved yet, still shows the spinner", async () => {
-          await callForHelmChartVersionsMock.resolve([]);
+          await requestHelmChartVersionsMock.resolve([]);
 
           expect(
             rendered.getByTestId("install-chart-tab-spinner"),
@@ -288,11 +237,11 @@ describe("installing helm chart from new tab", () => {
 
         describe("when default configuration and versions resolve", () => {
           beforeEach(async () => {
-            await callForHelmChartValuesMock.resolve(
+            await requestHelmChartValuesMock.resolve(
               "some-default-configuration",
             );
 
-            await callForHelmChartVersionsMock.resolve([
+            await requestHelmChartVersionsMock.resolve([
               HelmChart.create({
                 apiVersion: "some-api-version",
                 name: "some-name",
@@ -385,7 +334,7 @@ describe("installing helm chart from new tab", () => {
             });
 
             it("calls for installation with default configuration", () => {
-              expect(callForCreateHelmReleaseMock).toHaveBeenCalledWith({
+              expect(requestCreateHelmReleaseMock).toHaveBeenCalledWith({
                 chart: "some-name",
                 name: undefined,
                 namespace: "default",
@@ -397,7 +346,7 @@ describe("installing helm chart from new tab", () => {
 
             describe("when installation resolves", () => {
               beforeEach(async () => {
-                await callForCreateHelmReleaseMock.resolve({
+                await requestCreateHelmReleaseMock.resolve({
                   log: "some-execution-output",
 
                   release: {
@@ -496,8 +445,8 @@ describe("installing helm chart from new tab", () => {
 
           describe("given opening details for second chart, when details resolve", () => {
             beforeEach(async () => {
-              callForHelmChartReadmeMock.mockClear();
-              callForHelmChartVersionsMock.mockClear();
+              requestHelmChartReadmeMock.mockClear();
+              requestHelmChartVersionsMock.mockClear();
 
               const row = rendered.getByTestId(
                 "helm-chart-row-for-some-repository-some-other-name",
@@ -505,7 +454,7 @@ describe("installing helm chart from new tab", () => {
 
               fireEvent.click(row);
 
-              await callForHelmChartVersionsMock.resolve([
+              await requestHelmChartVersionsMock.resolve([
                 HelmChart.create({
                   apiVersion: "some-api-version",
                   name: "some-other-name",
@@ -523,7 +472,7 @@ describe("installing helm chart from new tab", () => {
                 }),
               ]);
 
-              await callForHelmChartReadmeMock.resolve("some-readme");
+              await requestHelmChartReadmeMock.resolve("some-readme");
             });
 
             it("renders", () => {
@@ -532,7 +481,7 @@ describe("installing helm chart from new tab", () => {
 
             describe("when selecting to install second chart", () => {
               beforeEach(() => {
-                callForHelmChartVersionsMock.mockClear();
+                requestHelmChartVersionsMock.mockClear();
 
                 const installButton = rendered.getByTestId(
                   "install-chart-for-some-repository-some-other-name",
@@ -560,7 +509,7 @@ describe("installing helm chart from new tab", () => {
               });
 
               it("calls for default configuration of the second chart", () => {
-                expect(callForHelmChartValuesMock).toHaveBeenCalledWith(
+                expect(requestHelmChartValuesMock).toHaveBeenCalledWith(
                   "some-repository",
                   "some-other-name",
                   "some-version",
@@ -568,7 +517,7 @@ describe("installing helm chart from new tab", () => {
               });
 
               it("calls for available versions for the second chart", () => {
-                expect(callForHelmChartVersionsMock).toHaveBeenCalledWith(
+                expect(requestHelmChartVersionsMock).toHaveBeenCalledWith(
                   "some-repository",
                   "some-other-name",
                 );
@@ -582,11 +531,11 @@ describe("installing helm chart from new tab", () => {
 
               describe("when configuration and versions resolve", () => {
                 beforeEach(async () => {
-                  await callForHelmChartValuesMock.resolve(
+                  await requestHelmChartValuesMock.resolve(
                     "some-other-default-configuration",
                   );
 
-                  await callForHelmChartVersionsMock.resolve([]);
+                  await requestHelmChartVersionsMock.resolve([]);
                 });
 
                 it("renders", () => {
@@ -607,7 +556,7 @@ describe("installing helm chart from new tab", () => {
                   fireEvent.click(installButton);
 
                   expect(
-                    callForCreateHelmReleaseMock,
+                    requestCreateHelmReleaseMock,
                   ).toHaveBeenCalledWith({
                     chart: "some-other-name",
                     name: undefined,
@@ -620,8 +569,8 @@ describe("installing helm chart from new tab", () => {
 
                 describe("when selecting the dock tab for installing first chart", () => {
                   beforeEach(() => {
-                    callForHelmChartValuesMock.mockClear();
-                    callForHelmChartVersionsMock.mockClear();
+                    requestHelmChartValuesMock.mockClear();
+                    requestHelmChartVersionsMock.mockClear();
 
                     const tab = rendered.getByTestId(
                       "dock-tab-for-some-first-tab-id",
@@ -636,13 +585,13 @@ describe("installing helm chart from new tab", () => {
 
                   it("does not call for default configuration", () => {
                     expect(
-                      callForHelmChartValuesMock,
+                      requestHelmChartValuesMock,
                     ).not.toHaveBeenCalled();
                   });
 
                   it("does not call for available versions", () => {
                     expect(
-                      callForHelmChartVersionsMock,
+                      requestHelmChartVersionsMock,
                     ).not.toHaveBeenCalled();
                   });
 
@@ -660,7 +609,7 @@ describe("installing helm chart from new tab", () => {
                     fireEvent.click(installButton);
 
                     expect(
-                      callForCreateHelmReleaseMock,
+                      requestCreateHelmReleaseMock,
                     ).toHaveBeenCalledWith({
                       chart: "some-name",
                       name: undefined,
@@ -679,8 +628,8 @@ describe("installing helm chart from new tab", () => {
             let menu: { selectOption: (labelText: string) => void };
 
             beforeEach(() => {
-              callForHelmChartVersionsMock.mockClear();
-              callForHelmChartValuesMock.mockClear();
+              requestHelmChartVersionsMock.mockClear();
+              requestHelmChartValuesMock.mockClear();
 
               const menuId =
                 "install-chart-version-select-for-some-first-tab-id";
@@ -708,7 +657,7 @@ describe("installing helm chart from new tab", () => {
               });
 
               it("calls for default configuration for the version of chart", () => {
-                expect(callForHelmChartValuesMock).toHaveBeenCalledWith(
+                expect(requestHelmChartValuesMock).toHaveBeenCalledWith(
                   "some-repository",
                   "some-name",
                   "some-other-version",
@@ -725,7 +674,7 @@ describe("installing helm chart from new tab", () => {
 
               it("does not call for versions again", () => {
                 expect(
-                  callForHelmChartVersionsMock,
+                  requestHelmChartVersionsMock,
                 ).not.toHaveBeenCalled();
               });
 
@@ -747,7 +696,7 @@ describe("installing helm chart from new tab", () => {
 
               describe("when default configuration resolves", () => {
                 beforeEach(async () => {
-                  await callForHelmChartValuesMock.resolve(
+                  await requestHelmChartValuesMock.resolve(
                     "some-default-configuration-for-other-version",
                   );
                 });
@@ -772,7 +721,7 @@ describe("installing helm chart from new tab", () => {
                   fireEvent.click(installButton);
 
                   expect(
-                    callForCreateHelmReleaseMock,
+                    requestCreateHelmReleaseMock,
                   ).toHaveBeenCalledWith({
                     chart: "some-name",
                     name: undefined,
@@ -829,7 +778,7 @@ describe("installing helm chart from new tab", () => {
 
                 fireEvent.click(installButton);
 
-                expect(callForCreateHelmReleaseMock).toHaveBeenCalledWith(
+                expect(requestCreateHelmReleaseMock).toHaveBeenCalledWith(
                   {
                     chart: "some-name",
                     name: undefined,
@@ -892,7 +841,7 @@ describe("installing helm chart from new tab", () => {
                 )
                 .selectOption("some-other-version");
 
-              await callForHelmChartValuesMock.resolve(
+              await requestHelmChartValuesMock.resolve(
                 "some-default-configuration-for-other-version",
               );
 
@@ -948,7 +897,7 @@ describe("installing helm chart from new tab", () => {
 
               fireEvent.click(installButton);
 
-              expect(callForCreateHelmReleaseMock).toHaveBeenCalledWith({
+              expect(requestCreateHelmReleaseMock).toHaveBeenCalledWith({
                 chart: "some-name",
                 name: undefined,
                 namespace: "default",
@@ -965,7 +914,7 @@ describe("installing helm chart from new tab", () => {
                 )
                 .selectOption("some-other-version");
 
-              await callForHelmChartValuesMock.resolve(
+              await requestHelmChartValuesMock.resolve(
                 "some-default-configuration-for-other-version",
               );
 
@@ -1014,7 +963,7 @@ describe("installing helm chart from new tab", () => {
 
               fireEvent.click(installButton);
 
-              expect(callForCreateHelmReleaseMock).toHaveBeenCalledWith({
+              expect(requestCreateHelmReleaseMock).toHaveBeenCalledWith({
                 chart: "some-name",
                 name: "some-custom-name",
                 namespace: "default",
diff --git a/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts b/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts
index c49f3a7942..978e1635a7 100644
--- a/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts
+++ b/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts
@@ -9,23 +9,23 @@ import type { ApplicationBuilder } from "../../../renderer/components/test-utils
 import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
 import { HelmChart } from "../../../common/k8s-api/endpoints/helm-charts.api";
 import getRandomInstallChartTabIdInjectable from "../../../renderer/components/dock/install-chart/get-random-install-chart-tab-id.injectable";
-import type { CallForHelmChartValues } from "../../../renderer/components/dock/install-chart/chart-data/call-for-helm-chart-values.injectable";
-import callForHelmChartValuesInjectable from "../../../renderer/components/dock/install-chart/chart-data/call-for-helm-chart-values.injectable";
 import namespaceStoreInjectable from "../../../renderer/components/+namespaces/store.injectable";
 import type { NamespaceStore } from "../../../renderer/components/+namespaces/store";
-import type { CallForHelmChartVersions } from "../../../renderer/components/+helm-charts/details/versions/call-for-helm-chart-versions.injectable";
-import callForHelmChartVersionsInjectable from "../../../renderer/components/+helm-charts/details/versions/call-for-helm-chart-versions.injectable";
 import writeJsonFileInjectable from "../../../common/fs/write-json-file.injectable";
 import directoryForLensLocalStorageInjectable from "../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable";
 import hostedClusterIdInjectable from "../../../renderer/cluster-frame-context/hosted-cluster-id.injectable";
 import { TabKind } from "../../../renderer/components/dock/dock/store";
 import { controlWhenStoragesAreReady } from "../../../renderer/utils/create-storage/storages-are-ready";
-import callForCreateHelmReleaseInjectable from "../../../renderer/components/+helm-releases/create-release/call-for-create-helm-release.injectable";
+import requestCreateHelmReleaseInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable";
+import type { RequestHelmChartVersions } from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable";
+import requestHelmChartVersionsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable";
+import type { RequestHelmChartValues } from "../../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable";
+import requestHelmChartValuesInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable";
 
 describe("installing helm chart from previously opened tab", () => {
   let builder: ApplicationBuilder;
-  let callForHelmChartVersionsMock: AsyncFnMock<CallForHelmChartVersions>;
-  let callForHelmChartValuesMock: AsyncFnMock<CallForHelmChartValues>;
+  let requestHelmChartVersionsMock: AsyncFnMock<RequestHelmChartVersions>;
+  let requestHelmChartValuesMock: AsyncFnMock<RequestHelmChartValues>;
   let storagesAreReady: () => Promise<void>;
 
   beforeEach(() => {
@@ -33,38 +33,17 @@ describe("installing helm chart from previously opened tab", () => {
 
     builder.setEnvironmentToClusterFrame();
 
-    callForHelmChartVersionsMock = asyncFn();
-    callForHelmChartValuesMock = asyncFn();
+    requestHelmChartVersionsMock = asyncFn();
+    requestHelmChartValuesMock = asyncFn();
 
     builder.beforeWindowStart((windowDi) => {
-      windowDi.override(
-        directoryForLensLocalStorageInjectable,
-        () => "/some-directory-for-lens-local-storage",
-      );
-
-      windowDi.override(hostedClusterIdInjectable, () => "some-cluster-id");
-
       storagesAreReady = controlWhenStoragesAreReady(windowDi);
 
-      windowDi.override(
-        callForHelmChartVersionsInjectable,
-        () => callForHelmChartVersionsMock,
-      );
-
-      windowDi.override(
-        callForHelmChartValuesInjectable,
-        () => callForHelmChartValuesMock,
-      );
-
-      windowDi.override(
-        callForHelmChartValuesInjectable,
-        () => callForHelmChartValuesMock,
-      );
-
-      windowDi.override(
-        callForCreateHelmReleaseInjectable,
-        () => jest.fn(),
-      );
+      windowDi.override(directoryForLensLocalStorageInjectable, () => "/some-directory-for-lens-local-storage");
+      windowDi.override(hostedClusterIdInjectable, () => "some-cluster-id");
+      windowDi.override(requestHelmChartVersionsInjectable, () => requestHelmChartVersionsMock);
+      windowDi.override(requestHelmChartValuesInjectable, () => requestHelmChartValuesMock);
+      windowDi.override(requestCreateHelmReleaseInjectable, () => jest.fn());
 
       // TODO: Replace store mocking with mock for the actual side-effect (where the namespaces are coming from)
       windowDi.override(
@@ -154,7 +133,7 @@ describe("installing helm chart from previously opened tab", () => {
     });
 
     it("calls for default configuration of the chart", () => {
-      expect(callForHelmChartValuesMock).toHaveBeenCalledWith(
+      expect(requestHelmChartValuesMock).toHaveBeenCalledWith(
         "some-repository",
         "some-name",
         "some-other-version",
@@ -162,7 +141,7 @@ describe("installing helm chart from previously opened tab", () => {
     });
 
     it("calls for available versions", () => {
-      expect(callForHelmChartVersionsMock).toHaveBeenCalledWith(
+      expect(requestHelmChartVersionsMock).toHaveBeenCalledWith(
         "some-repository",
         "some-name",
       );
@@ -170,11 +149,11 @@ describe("installing helm chart from previously opened tab", () => {
 
     describe("when configuration and version resolves", () => {
       beforeEach(async () => {
-        await callForHelmChartValuesMock.resolve(
+        await requestHelmChartValuesMock.resolve(
           "some-default-configuration",
         );
 
-        await callForHelmChartVersionsMock.resolve([
+        await requestHelmChartVersionsMock.resolve([
           HelmChart.create({
             apiVersion: "some-api-version",
             name: "some-name",
diff --git a/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts b/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts
index ddc682afd2..c41a7f14ad 100644
--- a/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts
+++ b/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts
@@ -8,69 +8,44 @@ import type { RenderResult } from "@testing-library/react";
 import { fireEvent } from "@testing-library/react";
 import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
-import type { CallForHelmCharts } from "../../../renderer/components/+helm-charts/helm-charts/call-for-helm-charts.injectable";
-import callForHelmChartsInjectable from "../../../renderer/components/+helm-charts/helm-charts/call-for-helm-charts.injectable";
 import { HelmChart } from "../../../common/k8s-api/endpoints/helm-charts.api";
 import getRandomInstallChartTabIdInjectable from "../../../renderer/components/dock/install-chart/get-random-install-chart-tab-id.injectable";
-import callForHelmChartValuesInjectable from "../../../renderer/components/dock/install-chart/chart-data/call-for-helm-chart-values.injectable";
-import callForCreateHelmReleaseInjectable from "../../../renderer/components/+helm-releases/create-release/call-for-create-helm-release.injectable";
-import type { CallForHelmChartReadme } from "../../../renderer/components/+helm-charts/details/readme/call-for-helm-chart-readme.injectable";
-import callForHelmChartReadmeInjectable from "../../../renderer/components/+helm-charts/details/readme/call-for-helm-chart-readme.injectable";
-import type { CallForHelmChartVersions } from "../../../renderer/components/+helm-charts/details/versions/call-for-helm-chart-versions.injectable";
-import callForHelmChartVersionsInjectable from "../../../renderer/components/+helm-charts/details/versions/call-for-helm-chart-versions.injectable";
+import requestCreateHelmReleaseInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable";
 import { flushPromises } from "../../../common/test-utils/flush-promises";
 import directoryForLensLocalStorageInjectable from "../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable";
 import hostedClusterIdInjectable from "../../../renderer/cluster-frame-context/hosted-cluster-id.injectable";
 import dockStoreInjectable from "../../../renderer/components/dock/dock/store.injectable";
+import type { RequestHelmCharts } from "../../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable";
+import type { RequestHelmChartVersions } from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable";
+import type { RequestHelmChartReadme } from "../../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable";
+import requestHelmChartsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable";
+import requestHelmChartVersionsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable";
+import requestHelmChartReadmeInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable";
+import requestHelmChartValuesInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable";
 
 describe("opening dock tab for installing helm chart", () => {
   let builder: ApplicationBuilder;
-  let callForHelmChartsMock: AsyncFnMock<CallForHelmCharts>;
-  let callForHelmChartVersionsMock: AsyncFnMock<CallForHelmChartVersions>;
-  let callForHelmChartReadmeMock: AsyncFnMock<CallForHelmChartReadme>;
-  let callForHelmChartValuesMock: jest.Mock;
+  let requestHelmChartsMock: AsyncFnMock<RequestHelmCharts>;
+  let requestHelmChartVersionsMock: AsyncFnMock<RequestHelmChartVersions>;
+  let requestHelmChartReadmeMock: AsyncFnMock<RequestHelmChartReadme>;
+  let requestHelmChartValuesMock: jest.Mock;
 
   beforeEach(() => {
     builder = getApplicationBuilder();
 
-    callForHelmChartsMock = asyncFn();
-    callForHelmChartVersionsMock = asyncFn();
-    callForHelmChartReadmeMock = asyncFn();
-    callForHelmChartValuesMock = jest.fn();
+    requestHelmChartsMock = asyncFn();
+    requestHelmChartVersionsMock = asyncFn();
+    requestHelmChartReadmeMock = asyncFn();
+    requestHelmChartValuesMock = jest.fn();
 
     builder.beforeWindowStart((windowDi) => {
-      windowDi.override(
-        directoryForLensLocalStorageInjectable,
-        () => "/some-directory-for-lens-local-storage",
-      );
-
+      windowDi.override(directoryForLensLocalStorageInjectable, () => "/some-directory-for-lens-local-storage");
       windowDi.override(hostedClusterIdInjectable, () => "some-cluster-id");
-
-      windowDi.override(
-        callForHelmChartsInjectable,
-        () => callForHelmChartsMock,
-      );
-
-      windowDi.override(
-        callForHelmChartVersionsInjectable,
-        () => callForHelmChartVersionsMock,
-      );
-
-      windowDi.override(
-        callForHelmChartReadmeInjectable,
-        () => callForHelmChartReadmeMock,
-      );
-
-      windowDi.override(
-        callForHelmChartValuesInjectable,
-        () => callForHelmChartValuesMock,
-      );
-
-      windowDi.override(
-        callForCreateHelmReleaseInjectable,
-        () => jest.fn(),
-      );
-
+      windowDi.override(requestHelmChartsInjectable, () => requestHelmChartsMock);
+      windowDi.override(requestHelmChartVersionsInjectable, () => requestHelmChartVersionsMock);
+      windowDi.override(requestHelmChartReadmeInjectable, () => requestHelmChartReadmeMock);
+      windowDi.override(requestHelmChartValuesInjectable, () => requestHelmChartValuesMock);
+      windowDi.override(requestCreateHelmReleaseInjectable, () => jest.fn());
       windowDi.override(getRandomInstallChartTabIdInjectable, () =>
         jest
           .fn(() => "some-irrelevant-tab-id")
@@ -102,12 +77,12 @@ describe("opening dock tab for installing helm chart", () => {
     });
 
     it("calls for charts", () => {
-      expect(callForHelmChartsMock).toHaveBeenCalled();
+      expect(requestHelmChartsMock).toHaveBeenCalled();
     });
 
     describe("when charts resolve", () => {
       beforeEach(async () => {
-        await callForHelmChartsMock.resolve([
+        await requestHelmChartsMock.resolve([
           HelmChart.create({
             apiVersion: "some-api-version",
             name: "some-name",
@@ -120,7 +95,10 @@ describe("opening dock tab for installing helm chart", () => {
             urls: [],
             annotations: {},
             dependencies: [],
-            maintainers: [],
+            maintainers: [{
+              email: "some@foo.com",
+              name: "Some Foo",
+            }],
             deprecated: false,
           }),
 
@@ -136,7 +114,10 @@ describe("opening dock tab for installing helm chart", () => {
             urls: [],
             annotations: {},
             dependencies: [],
-            maintainers: [],
+            maintainers: [{
+              email: "other@bar.com",
+              name: "Other Bar",
+            }],
             deprecated: false,
           }),
         ]);
@@ -160,7 +141,7 @@ describe("opening dock tab for installing helm chart", () => {
         });
 
         it("calls for chart versions", () => {
-          expect(callForHelmChartVersionsMock).toHaveBeenCalledWith(
+          expect(requestHelmChartVersionsMock).toHaveBeenCalledWith(
             "some-repository",
             "some-name",
           );
@@ -174,7 +155,7 @@ describe("opening dock tab for installing helm chart", () => {
 
         describe("when chart versions resolve", () => {
           beforeEach(async () => {
-            await callForHelmChartVersionsMock.resolve([
+            await requestHelmChartVersionsMock.resolve([
               HelmChart.create({
                 apiVersion: "some-api-version",
                 name: "some-name",
@@ -187,7 +168,10 @@ describe("opening dock tab for installing helm chart", () => {
                 urls: [],
                 annotations: {},
                 dependencies: [],
-                maintainers: [],
+                maintainers: [{
+                  email: "some@foo.com",
+                  name: "Some Foo",
+                }],
                 deprecated: false,
               }),
 
@@ -203,14 +187,17 @@ describe("opening dock tab for installing helm chart", () => {
                 urls: [],
                 annotations: {},
                 dependencies: [],
-                maintainers: [],
+                maintainers: [{
+                  email: "other@bar.com",
+                  name: "Other Bar",
+                }],
                 deprecated: false,
               }),
             ]);
           });
 
           it("calls for chart readme for the version", () => {
-            expect(callForHelmChartReadmeMock).toHaveBeenCalledWith(
+            expect(requestHelmChartReadmeMock).toHaveBeenCalledWith(
               "some-repository",
               "some-name",
               "some-version",
@@ -243,7 +230,7 @@ describe("opening dock tab for installing helm chart", () => {
 
           describe("when readme resolves", () => {
             beforeEach(async () => {
-              await callForHelmChartReadmeMock.resolve("some-readme");
+              await requestHelmChartReadmeMock.resolve("some-readme");
             });
 
             it("renders", () => {
@@ -258,7 +245,7 @@ describe("opening dock tab for installing helm chart", () => {
 
             describe("when selecting different version", () => {
               beforeEach(() => {
-                callForHelmChartReadmeMock.mockClear();
+                requestHelmChartReadmeMock.mockClear();
 
                 builder.select
                   .openMenu(
@@ -280,7 +267,7 @@ describe("opening dock tab for installing helm chart", () => {
               });
 
               it("calls for chart readme for the version", () => {
-                expect(callForHelmChartReadmeMock).toHaveBeenCalledWith(
+                expect(requestHelmChartReadmeMock).toHaveBeenCalledWith(
                   "some-repository",
                   "some-name",
                   "some-other-version",
@@ -289,7 +276,7 @@ describe("opening dock tab for installing helm chart", () => {
 
               describe("when readme resolves", () => {
                 beforeEach(async () => {
-                  await callForHelmChartReadmeMock.resolve("some-readme");
+                  await requestHelmChartReadmeMock.resolve("some-readme");
                 });
 
                 it("renders", () => {
@@ -305,7 +292,7 @@ describe("opening dock tab for installing helm chart", () => {
 
                   await flushPromises();
 
-                  expect(callForHelmChartValuesMock).toHaveBeenCalledWith(
+                  expect(requestHelmChartValuesMock).toHaveBeenCalledWith(
                     "some-repository",
                     "some-name",
                     "some-other-version",
@@ -316,7 +303,7 @@ describe("opening dock tab for installing helm chart", () => {
 
             describe("when selecting to install the chart", () => {
               beforeEach(() => {
-                callForHelmChartVersionsMock.mockClear();
+                requestHelmChartVersionsMock.mockClear();
 
                 const installButton = rendered.getByTestId(
                   "install-chart-for-some-repository-some-name",
diff --git a/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts b/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts
index c8407767ef..df92796e76 100644
--- a/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts
+++ b/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts
@@ -10,18 +10,18 @@ import readYamlFileInjectable from "../../common/fs/read-yaml-file.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import type { HelmRepositoriesFromYaml } from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
-import execFileInjectable from "../../common/fs/exec-file.injectable";
+import execFileInjectable, { type ExecFile } from "../../common/fs/exec-file.injectable";
 import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable";
 import loggerInjectable from "../../common/logger.injectable";
 import type { Logger } from "../../common/logger";
-import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
+import callForPublicHelmRepositoriesInjectable from "./child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
 import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable";
 
 describe("listing active helm repositories in preferences", () => {
   let builder: ApplicationBuilder;
   let rendered: RenderResult;
   let readYamlFileMock: AsyncFnMock<ReadYamlFile>;
-  let execFileMock: AsyncFnMock<ReturnType<typeof execFileInjectable["instantiate"]>>;
+  let execFileMock: AsyncFnMock<ExecFile>;
   let loggerStub: Logger;
   let showErrorNotificationMock: jest.Mock;
 
@@ -69,7 +69,10 @@ describe("listing active helm repositories in preferences", () => {
       expect(execFileMock).toHaveBeenCalledWith(
         "some-helm-binary-path",
         ["env"],
-        { "maxBuffer": 34359738368 },
+        {
+          maxBuffer: 34359738368,
+          env: {},
+        },
       );
     });
 
@@ -77,13 +80,21 @@ describe("listing active helm repositories in preferences", () => {
       expect(execFileMock).not.toHaveBeenCalledWith(
         "some-helm-binary-path",
         ["repo", "update"],
-        { "maxBuffer": 34359738368 },
+        {
+          maxBuffer: 34359738368,
+          env: {},
+        },
       );
     });
 
     describe("when getting configuration rejects", () => {
       beforeEach(async () => {
-        await execFileMock.reject("some-error");
+        await execFileMock.resolve({
+          callWasSuccessful: false,
+          error: Object.assign(new Error("Some error"), {
+            stderr: "some-error",
+          }),
+        });
       });
 
       it("shows error notification", () => {
@@ -115,7 +126,10 @@ describe("listing active helm repositories in preferences", () => {
 
         await execFileMock.resolveSpecific(
           ["some-helm-binary-path", ["env"]],
-          "HELM_REPOSITORY_CACHE=some-helm-repository-cache-path",
+          {
+            callWasSuccessful: true,
+            response: "HELM_REPOSITORY_CACHE=some-helm-repository-cache-path",
+          },
         );
       });
 
@@ -154,7 +168,10 @@ describe("listing active helm repositories in preferences", () => {
 
         await execFileMock.resolveSpecific(
           ["some-helm-binary-path", ["env"]],
-          "HELM_REPOSITORY_CONFIG=some-helm-repository-config-file.yaml",
+          {
+            callWasSuccessful: true,
+            response: "HELM_REPOSITORY_CONFIG=some-helm-repository-config-file.yaml",
+          },
         );
       });
 
@@ -193,11 +210,13 @@ describe("listing active helm repositories in preferences", () => {
 
         await execFileMock.resolveSpecific(
           ["some-helm-binary-path", ["env"]],
-
-          [
-            "HELM_REPOSITORY_CONFIG=some-helm-repository-config-file.yaml",
-            "HELM_REPOSITORY_CACHE=some-helm-repository-cache-path",
-          ].join("\n"),
+          {
+            callWasSuccessful: true,
+            response: [
+              "HELM_REPOSITORY_CONFIG=some-helm-repository-config-file.yaml",
+              "HELM_REPOSITORY_CACHE=some-helm-repository-cache-path",
+            ].join("\n"),
+          },
         );
       });
 
@@ -209,7 +228,10 @@ describe("listing active helm repositories in preferences", () => {
         expect(execFileMock).toHaveBeenCalledWith(
           "some-helm-binary-path",
           ["repo", "update"],
-          { "maxBuffer": 34359738368 },
+          {
+            maxBuffer: 34359738368,
+            env: {},
+          },
         );
       });
 
@@ -219,7 +241,12 @@ describe("listing active helm repositories in preferences", () => {
 
       describe("when updating repositories reject with any other error", () => {
         beforeEach(async () => {
-          await execFileMock.reject("Some error");
+          await execFileMock.resolve({
+            callWasSuccessful: false,
+            error: Object.assign(new Error("Some error"), {
+              stderr: "Some error",
+            }),
+          });
         });
 
         it("shows error notification", () => {
@@ -249,9 +276,12 @@ describe("listing active helm repositories in preferences", () => {
         beforeEach(async () => {
           execFileMock.mockClear();
 
-          await execFileMock.reject(
-            "Error: no repositories found. You must add one before updating",
-          );
+          await execFileMock.resolve({
+            callWasSuccessful: false,
+            error: Object.assign(new Error("no repositories found. You must add one before updating"), {
+              stderr: "no repositories found. You must add one before updating",
+            }),
+          });
         });
 
         it("renders", () => {
@@ -268,13 +298,21 @@ describe("listing active helm repositories in preferences", () => {
           expect(execFileMock).toHaveBeenCalledWith(
             "some-helm-binary-path",
             ["repo", "add", "bitnami", "https://charts.bitnami.com/bitnami"],
-            { "maxBuffer": 34359738368 },
+            {
+              maxBuffer: 34359738368,
+              env: {},
+            },
           );
         });
 
         describe("when adding default repository reject", () => {
           beforeEach(async () => {
-            await execFileMock.reject("Some error");
+            await execFileMock.resolve({
+              callWasSuccessful: false,
+              error: Object.assign(new Error("Some error"), {
+                stderr: "Some error",
+              }),
+            });
           });
 
           it("shows error notification", () => {
@@ -307,7 +345,6 @@ describe("listing active helm repositories in preferences", () => {
             await execFileMock.resolveSpecific(
               [
                 "some-helm-binary-path",
-
                 [
                   "repo",
                   "add",
@@ -315,8 +352,10 @@ describe("listing active helm repositories in preferences", () => {
                   "https://charts.bitnami.com/bitnami",
                 ],
               ],
-
-              "",
+              {
+                callWasSuccessful: true,
+                response: "",
+              },
             );
           });
 
@@ -380,7 +419,10 @@ describe("listing active helm repositories in preferences", () => {
 
           await execFileMock.resolveSpecific(
             ["some-helm-binary-path", ["repo", "update"]],
-            "",
+            {
+              callWasSuccessful: true,
+              response: "",
+            },
           );
         });
 
@@ -404,7 +446,10 @@ describe("listing active helm repositories in preferences", () => {
             expect(execFileMock).not.toHaveBeenCalledWith(
               "some-helm-binary-path",
               ["repo", "add", "bitnami", "https://charts.bitnami.com/bitnami"],
-              { "maxBuffer": 34359738368 },
+              {
+                maxBuffer: 34359738368,
+                env: {},
+              },
             );
           });
 
diff --git a/src/features/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts b/src/features/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts
index 7a3e787a53..f2a23f0409 100644
--- a/src/features/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts
+++ b/src/features/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts
@@ -8,20 +8,19 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
+import type { ExecFile } from "../../common/fs/exec-file.injectable";
 import execFileInjectable from "../../common/fs/exec-file.injectable";
 import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable";
 import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
 import type { HelmRepo } from "../../common/helm/helm-repo";
-import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
+import callForPublicHelmRepositoriesInjectable from "./child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
 import type { AsyncResult } from "../../common/utils/async-result";
 
 describe("remove helm repository from list of active repositories in preferences", () => {
   let builder: ApplicationBuilder;
   let rendered: RenderResult;
   let getActiveHelmRepositoriesMock: AsyncFnMock<() => Promise<AsyncResult<HelmRepo[]>>>;
-  let execFileMock: AsyncFnMock<
-    ReturnType<typeof execFileInjectable["instantiate"]>
-  >;
+  let execFileMock: AsyncFnMock<ExecFile>;
 
   beforeEach(async () => {
     builder = getApplicationBuilder();
@@ -86,7 +85,10 @@ describe("remove helm repository from list of active repositories in preferences
           expect(execFileMock).toHaveBeenCalledWith(
             "some-helm-binary-path",
             ["repo", "remove", "some-active-repository"],
-            { "maxBuffer": 34359738368 },
+            {
+              maxBuffer: 34359738368,
+              env: {},
+            },
           );
         });
 
@@ -101,8 +103,10 @@ describe("remove helm repository from list of active repositories in preferences
                 "some-helm-binary-path",
                 ["repo", "remove", "some-active-repository"],
               ],
-
-              "",
+              {
+                callWasSuccessful: true,
+                response: "",
+              },
             );
           });
 
diff --git a/src/features/helm-charts/upgrade-chart/__snapshots__/upgrade-chart-new-tab.test.ts.snap b/src/features/helm-charts/upgrade-chart/__snapshots__/upgrade-chart-new-tab.test.ts.snap
new file mode 100644
index 0000000000..52d08559d6
--- /dev/null
+++ b/src/features/helm-charts/upgrade-chart/__snapshots__/upgrade-chart-new-tab.test.ts.snap
@@ -0,0 +1,5785 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navigating to the helm releases view renders 1`] = `
+<body>
+  <div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+    <div
+      class="mainLayout"
+      style="--sidebar-width: 200px;"
+    >
+      <div
+        class="sidebar"
+      >
+        <div
+          class="flex flex-col"
+          data-testid="cluster-sidebar"
+        >
+          <div
+            class="SidebarCluster"
+          >
+            <div
+              class="Avatar rounded loadingAvatar"
+              style="width: 40px; height: 40px;"
+            >
+              ??
+            </div>
+            <div
+              class="loadingClusterName"
+            />
+          </div>
+          <div
+            class="sidebarNav sidebar-active-status"
+          >
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-workloads"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-workloads"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Workloads
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-config"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-config"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="list"
+                  >
+                    list
+                  </span>
+                </i>
+                <span>
+                  Config
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-network"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-network"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="device_hub"
+                  >
+                    device_hub
+                  </span>
+                </i>
+                <span>
+                  Network
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-storage"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-storage"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="storage"
+                  >
+                    storage
+                  </span>
+                </i>
+                <span>
+                  Storage
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="true"
+              data-testid="sidebar-item-helm"
+            >
+              <a
+                aria-current="page"
+                class="navItem active"
+                data-testid="sidebar-item-link-for-helm"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Helm
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-user-management"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-user-management"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="security"
+                  >
+                    security
+                  </span>
+                </i>
+                <span>
+                  Access Control
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-custom-resources"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-custom-resources"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="extension"
+                  >
+                    extension
+                  </span>
+                </i>
+                <span>
+                  Custom Resources
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+          </div>
+        </div>
+        <div
+          class="ResizingAnchor horizontal trailing"
+        />
+      </div>
+      <div
+        class="contents"
+      >
+        <div
+          class="TabLayout"
+          data-testid="tab-layout"
+        >
+          <div
+            class="Tabs center scrollable"
+          >
+            <div
+              class="Tab flex gaps align-center"
+              data-is-active-test="false"
+              data-testid="tab-link-for-charts"
+              role="tab"
+              tabindex="0"
+            >
+              <div
+                class="label"
+              >
+                Charts
+              </div>
+            </div>
+            <div
+              class="Tab flex gaps align-center active"
+              data-is-active-test="true"
+              data-testid="tab-link-for-releases"
+              role="tab"
+              tabindex="0"
+            >
+              <div
+                class="label"
+              >
+                Releases
+              </div>
+            </div>
+          </div>
+          <main>
+            <div
+              class="ItemListLayout flex column HelmReleases"
+            >
+              <div
+                class="header flex gaps align-center"
+              >
+                <h5
+                  class="title"
+                >
+                  Releases
+                </h5>
+                <div
+                  class="info-panel box grow"
+                >
+                  0 items
+                </div>
+                <div
+                  class="NamespaceSelectFilterParent"
+                  data-testid="namespace-select-filter"
+                >
+                  <div
+                    class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-namespace-select-filter-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-namespace-select-filter-placeholder"
+                        >
+                          Namespace: my-second-namespace
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-namespace-select-filter-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="namespace-select-filter"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="Input SearchInput focused"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      placeholder="Search Releases..."
+                      spellcheck="false"
+                      value=""
+                    />
+                    <i
+                      class="Icon material focusable small"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="search"
+                      >
+                        search
+                      </span>
+                    </i>
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </div>
+              <div
+                class="items box grow flex column"
+              >
+                <div
+                  class="Table flex column HelmReleases box grow dark selectable scrollable sortable autoSize virtual"
+                >
+                  <div
+                    class="TableHead sticky nowrap topLine"
+                  >
+                    <div
+                      class="TableCell checkbox"
+                    >
+                      <label
+                        class="Checkbox flex align-center"
+                      >
+                        <input
+                          type="checkbox"
+                        />
+                        <i
+                          class="box flex align-center"
+                        />
+                      </label>
+                    </div>
+                    <div
+                      class="TableCell name nowrap sorting"
+                      id="name"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Name
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell namespace nowrap sorting"
+                      id="namespace"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Namespace
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell chart nowrap sorting"
+                      id="chart"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Chart
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell revision nowrap sorting"
+                      id="revision"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Revision
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell version nowrap"
+                      id="version"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Version
+                      </div>
+                    </div>
+                    <div
+                      class="TableCell app-version nowrap"
+                      id="app-version"
+                    >
+                      <div
+                        class="content"
+                      >
+                        App Version
+                      </div>
+                    </div>
+                    <div
+                      class="TableCell status nowrap sorting"
+                      id="status"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Status
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell updated nowrap sorting"
+                      id="update"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Updated
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell menu nowrap"
+                    >
+                      <div
+                        class="content"
+                      >
+                        <i
+                          class="Icon material interactive focusable"
+                          id="menu-actions-for-item-object-list-content"
+                          tabindex="0"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="more_vert"
+                          >
+                            more_vert
+                          </span>
+                        </i>
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    class="Spinner singleColor center"
+                    data-testid="helm-releases-spinner"
+                  />
+                </div>
+                <div
+                  class="AddRemoveButtons flex gaps"
+                />
+              </div>
+            </div>
+          </main>
+        </div>
+      </div>
+      <div
+        class="footer"
+      >
+        <div
+          class="Dock"
+          tabindex="-1"
+        >
+          <div
+            class="ResizingAnchor vertical leading disabled"
+          />
+          <div
+            class="tabs-container flex align-center"
+          >
+            <div
+              class="dockTabs"
+              role="tablist"
+            >
+              <div
+                class="Tabs tabs"
+              />
+            </div>
+            <div
+              class="toolbar flex gaps align-center box grow pl-0"
+            >
+              <div
+                class="dock-menu box grow"
+              >
+                <i
+                  class="Icon new-dock-tab material interactive focusable"
+                  id="menu-actions-for-dock"
+                  tabindex="0"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="add"
+                  >
+                    add
+                  </span>
+                </i>
+                <div>
+                  New tab
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</body>
+`;
+
+exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navigating to the helm releases view when helm releases resolves renders 1`] = `
+<body>
+  <div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+    <div
+      class="mainLayout"
+      style="--sidebar-width: 200px;"
+    >
+      <div
+        class="sidebar"
+      >
+        <div
+          class="flex flex-col"
+          data-testid="cluster-sidebar"
+        >
+          <div
+            class="SidebarCluster"
+          >
+            <div
+              class="Avatar rounded loadingAvatar"
+              style="width: 40px; height: 40px;"
+            >
+              ??
+            </div>
+            <div
+              class="loadingClusterName"
+            />
+          </div>
+          <div
+            class="sidebarNav sidebar-active-status"
+          >
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-workloads"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-workloads"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Workloads
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-config"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-config"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="list"
+                  >
+                    list
+                  </span>
+                </i>
+                <span>
+                  Config
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-network"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-network"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="device_hub"
+                  >
+                    device_hub
+                  </span>
+                </i>
+                <span>
+                  Network
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-storage"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-storage"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="storage"
+                  >
+                    storage
+                  </span>
+                </i>
+                <span>
+                  Storage
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="true"
+              data-testid="sidebar-item-helm"
+            >
+              <a
+                aria-current="page"
+                class="navItem active"
+                data-testid="sidebar-item-link-for-helm"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Helm
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-user-management"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-user-management"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="security"
+                  >
+                    security
+                  </span>
+                </i>
+                <span>
+                  Access Control
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-custom-resources"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-custom-resources"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="extension"
+                  >
+                    extension
+                  </span>
+                </i>
+                <span>
+                  Custom Resources
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+          </div>
+        </div>
+        <div
+          class="ResizingAnchor horizontal trailing"
+        />
+      </div>
+      <div
+        class="contents"
+      >
+        <div
+          class="TabLayout"
+          data-testid="tab-layout"
+        >
+          <div
+            class="Tabs center scrollable"
+          >
+            <div
+              class="Tab flex gaps align-center"
+              data-is-active-test="false"
+              data-testid="tab-link-for-charts"
+              role="tab"
+              tabindex="0"
+            >
+              <div
+                class="label"
+              >
+                Charts
+              </div>
+            </div>
+            <div
+              class="Tab flex gaps align-center active"
+              data-is-active-test="true"
+              data-testid="tab-link-for-releases"
+              role="tab"
+              tabindex="0"
+            >
+              <div
+                class="label"
+              >
+                Releases
+              </div>
+            </div>
+          </div>
+          <main>
+            <div
+              class="ItemListLayout flex column HelmReleases"
+            >
+              <div
+                class="header flex gaps align-center"
+              >
+                <h5
+                  class="title"
+                >
+                  Releases
+                </h5>
+                <div
+                  class="info-panel box grow"
+                >
+                  1 item
+                </div>
+                <div
+                  class="NamespaceSelectFilterParent"
+                  data-testid="namespace-select-filter"
+                >
+                  <div
+                    class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-namespace-select-filter-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-namespace-select-filter-placeholder"
+                        >
+                          Namespace: my-second-namespace
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-namespace-select-filter-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="namespace-select-filter"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="Input SearchInput focused"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      placeholder="Search Releases..."
+                      spellcheck="false"
+                      value=""
+                    />
+                    <i
+                      class="Icon material focusable small"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="search"
+                      >
+                        search
+                      </span>
+                    </i>
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </div>
+              <div
+                class="items box grow flex column"
+              >
+                <div
+                  class="Table flex column HelmReleases box grow dark selectable scrollable sortable autoSize virtual"
+                >
+                  <div
+                    class="TableHead sticky nowrap topLine"
+                  >
+                    <div
+                      class="TableCell checkbox"
+                    >
+                      <label
+                        class="Checkbox flex align-center"
+                      >
+                        <input
+                          type="checkbox"
+                        />
+                        <i
+                          class="box flex align-center"
+                        />
+                      </label>
+                    </div>
+                    <div
+                      class="TableCell name nowrap sorting"
+                      id="name"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Name
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell namespace nowrap sorting"
+                      id="namespace"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Namespace
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell chart nowrap sorting"
+                      id="chart"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Chart
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell revision nowrap sorting"
+                      id="revision"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Revision
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell version nowrap"
+                      id="version"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Version
+                      </div>
+                    </div>
+                    <div
+                      class="TableCell app-version nowrap"
+                      id="app-version"
+                    >
+                      <div
+                        class="content"
+                      >
+                        App Version
+                      </div>
+                    </div>
+                    <div
+                      class="TableCell status nowrap sorting"
+                      id="status"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Status
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell updated nowrap sorting"
+                      id="update"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Updated
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell menu nowrap"
+                    >
+                      <div
+                        class="content"
+                      >
+                        <i
+                          class="Icon material interactive focusable"
+                          id="menu-actions-for-item-object-list-content"
+                          tabindex="0"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="more_vert"
+                          >
+                            more_vert
+                          </span>
+                        </i>
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    class="VirtualList HelmReleases box grow dark"
+                  >
+                    <div>
+                      <div
+                        class="list"
+                        style="position: relative; height: 420000px; width: 100%; overflow: auto; will-change: transform; direction: ltr;"
+                      >
+                        <div
+                          style="height: 33px; width: 100%;"
+                        >
+                          <div
+                            style="position: absolute; left: 0px; top: 0px; height: 33px; width: 100%;"
+                          >
+                            <div
+                              class="TableRow nowrap"
+                              data-testid="helm-release-row-for-my-second-namespace/some-name"
+                            >
+                              <div
+                                class="TableCell checkbox"
+                              >
+                                <label
+                                  class="Checkbox flex align-center"
+                                >
+                                  <input
+                                    type="checkbox"
+                                  />
+                                  <i
+                                    class="box flex align-center"
+                                  />
+                                </label>
+                              </div>
+                              <div
+                                class="TableCell name"
+                              >
+                                some-name
+                              </div>
+                              <div
+                                class="TableCell namespace"
+                              >
+                                my-second-namespace
+                              </div>
+                              <div
+                                class="TableCell chart"
+                              >
+                                some-chart
+                              </div>
+                              <div
+                                class="TableCell revision"
+                              >
+                                NaN
+                              </div>
+                              <div
+                                class="TableCell version"
+                              >
+                                1.0.0
+                              </div>
+                              <div
+                                class="TableCell app-version"
+                              >
+                                some-app-version
+                              </div>
+                              <div
+                                class="TableCell some-status status"
+                              >
+                                Some-status
+                              </div>
+                              <div
+                                class="TableCell updated"
+                              >
+                                NaNy
+                              </div>
+                              <div
+                                class="TableCell menu"
+                              >
+                                <div>
+                                  <i
+                                    class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-my-second-namespace/some-name"
+                                    id="menu-actions-for-release-menu-for-my-second-namespace/some-name"
+                                    tabindex="0"
+                                  >
+                                    <span
+                                      class="icon"
+                                      data-icon-name="more_vert"
+                                    >
+                                      more_vert
+                                    </span>
+                                  </i>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="AddRemoveButtons flex gaps"
+                />
+              </div>
+            </div>
+          </main>
+        </div>
+      </div>
+      <div
+        class="footer"
+      >
+        <div
+          class="Dock"
+          tabindex="-1"
+        >
+          <div
+            class="ResizingAnchor vertical leading disabled"
+          />
+          <div
+            class="tabs-container flex align-center"
+          >
+            <div
+              class="dockTabs"
+              role="tablist"
+            >
+              <div
+                class="Tabs tabs"
+              />
+            </div>
+            <div
+              class="toolbar flex gaps align-center box grow pl-0"
+            >
+              <div
+                class="dock-menu box grow"
+              >
+                <i
+                  class="Icon new-dock-tab material interactive focusable"
+                  id="menu-actions-for-dock"
+                  tabindex="0"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="add"
+                  >
+                    add
+                  </span>
+                </i>
+                <div>
+                  New tab
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</body>
+`;
+
+exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navigating to the helm releases view when helm releases resolves when clicking the menu for a helm release renders 1`] = `
+<body>
+  <div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+    <div
+      class="mainLayout"
+      style="--sidebar-width: 200px;"
+    >
+      <div
+        class="sidebar"
+      >
+        <div
+          class="flex flex-col"
+          data-testid="cluster-sidebar"
+        >
+          <div
+            class="SidebarCluster"
+          >
+            <div
+              class="Avatar rounded loadingAvatar"
+              style="width: 40px; height: 40px;"
+            >
+              ??
+            </div>
+            <div
+              class="loadingClusterName"
+            />
+          </div>
+          <div
+            class="sidebarNav sidebar-active-status"
+          >
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-workloads"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-workloads"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Workloads
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-config"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-config"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="list"
+                  >
+                    list
+                  </span>
+                </i>
+                <span>
+                  Config
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-network"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-network"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="device_hub"
+                  >
+                    device_hub
+                  </span>
+                </i>
+                <span>
+                  Network
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-storage"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-storage"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="storage"
+                  >
+                    storage
+                  </span>
+                </i>
+                <span>
+                  Storage
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="true"
+              data-testid="sidebar-item-helm"
+            >
+              <a
+                aria-current="page"
+                class="navItem active"
+                data-testid="sidebar-item-link-for-helm"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Helm
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-user-management"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-user-management"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="security"
+                  >
+                    security
+                  </span>
+                </i>
+                <span>
+                  Access Control
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-custom-resources"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-custom-resources"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="extension"
+                  >
+                    extension
+                  </span>
+                </i>
+                <span>
+                  Custom Resources
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+          </div>
+        </div>
+        <div
+          class="ResizingAnchor horizontal trailing"
+        />
+      </div>
+      <div
+        class="contents"
+      >
+        <div
+          class="TabLayout"
+          data-testid="tab-layout"
+        >
+          <div
+            class="Tabs center scrollable"
+          >
+            <div
+              class="Tab flex gaps align-center"
+              data-is-active-test="false"
+              data-testid="tab-link-for-charts"
+              role="tab"
+              tabindex="0"
+            >
+              <div
+                class="label"
+              >
+                Charts
+              </div>
+            </div>
+            <div
+              class="Tab flex gaps align-center active"
+              data-is-active-test="true"
+              data-testid="tab-link-for-releases"
+              role="tab"
+              tabindex="0"
+            >
+              <div
+                class="label"
+              >
+                Releases
+              </div>
+            </div>
+          </div>
+          <main>
+            <div
+              class="ItemListLayout flex column HelmReleases"
+            >
+              <div
+                class="header flex gaps align-center"
+              >
+                <h5
+                  class="title"
+                >
+                  Releases
+                </h5>
+                <div
+                  class="info-panel box grow"
+                >
+                  1 item
+                </div>
+                <div
+                  class="NamespaceSelectFilterParent"
+                  data-testid="namespace-select-filter"
+                >
+                  <div
+                    class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-namespace-select-filter-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-namespace-select-filter-placeholder"
+                        >
+                          Namespace: my-second-namespace
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-namespace-select-filter-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="namespace-select-filter"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="Input SearchInput focused"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      placeholder="Search Releases..."
+                      spellcheck="false"
+                      value=""
+                    />
+                    <i
+                      class="Icon material focusable small"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="search"
+                      >
+                        search
+                      </span>
+                    </i>
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </div>
+              <div
+                class="items box grow flex column"
+              >
+                <div
+                  class="Table flex column HelmReleases box grow dark selectable scrollable sortable autoSize virtual"
+                >
+                  <div
+                    class="TableHead sticky nowrap topLine"
+                  >
+                    <div
+                      class="TableCell checkbox"
+                    >
+                      <label
+                        class="Checkbox flex align-center"
+                      >
+                        <input
+                          type="checkbox"
+                        />
+                        <i
+                          class="box flex align-center"
+                        />
+                      </label>
+                    </div>
+                    <div
+                      class="TableCell name nowrap sorting"
+                      id="name"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Name
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell namespace nowrap sorting"
+                      id="namespace"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Namespace
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell chart nowrap sorting"
+                      id="chart"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Chart
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell revision nowrap sorting"
+                      id="revision"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Revision
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell version nowrap"
+                      id="version"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Version
+                      </div>
+                    </div>
+                    <div
+                      class="TableCell app-version nowrap"
+                      id="app-version"
+                    >
+                      <div
+                        class="content"
+                      >
+                        App Version
+                      </div>
+                    </div>
+                    <div
+                      class="TableCell status nowrap sorting"
+                      id="status"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Status
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell updated nowrap sorting"
+                      id="update"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Updated
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell menu nowrap"
+                    >
+                      <div
+                        class="content"
+                      >
+                        <i
+                          class="Icon material interactive focusable"
+                          id="menu-actions-for-item-object-list-content"
+                          tabindex="0"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="more_vert"
+                          >
+                            more_vert
+                          </span>
+                        </i>
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    class="VirtualList HelmReleases box grow dark"
+                  >
+                    <div>
+                      <div
+                        class="list"
+                        style="position: relative; height: 420000px; width: 100%; overflow: auto; will-change: transform; direction: ltr;"
+                      >
+                        <div
+                          style="height: 33px; width: 100%;"
+                        >
+                          <div
+                            style="position: absolute; left: 0px; top: 0px; height: 33px; width: 100%;"
+                          >
+                            <div
+                              class="TableRow nowrap"
+                              data-testid="helm-release-row-for-my-second-namespace/some-name"
+                            >
+                              <div
+                                class="TableCell checkbox"
+                              >
+                                <label
+                                  class="Checkbox flex align-center"
+                                >
+                                  <input
+                                    type="checkbox"
+                                  />
+                                  <i
+                                    class="box flex align-center"
+                                  />
+                                </label>
+                              </div>
+                              <div
+                                class="TableCell name"
+                              >
+                                some-name
+                              </div>
+                              <div
+                                class="TableCell namespace"
+                              >
+                                my-second-namespace
+                              </div>
+                              <div
+                                class="TableCell chart"
+                              >
+                                some-chart
+                              </div>
+                              <div
+                                class="TableCell revision"
+                              >
+                                NaN
+                              </div>
+                              <div
+                                class="TableCell version"
+                              >
+                                1.0.0
+                              </div>
+                              <div
+                                class="TableCell app-version"
+                              >
+                                some-app-version
+                              </div>
+                              <div
+                                class="TableCell some-status status"
+                              >
+                                Some-status
+                              </div>
+                              <div
+                                class="TableCell updated"
+                              >
+                                NaNy
+                              </div>
+                              <div
+                                class="TableCell menu"
+                              >
+                                <div>
+                                  <i
+                                    class="Icon material interactive active focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-my-second-namespace/some-name"
+                                    id="menu-actions-for-release-menu-for-my-second-namespace/some-name"
+                                    tabindex="0"
+                                  >
+                                    <span
+                                      class="icon"
+                                      data-icon-name="more_vert"
+                                    >
+                                      more_vert
+                                    </span>
+                                  </i>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="AddRemoveButtons flex gaps"
+                />
+              </div>
+            </div>
+          </main>
+        </div>
+      </div>
+      <div
+        class="footer"
+      >
+        <div
+          class="Dock"
+          tabindex="-1"
+        >
+          <div
+            class="ResizingAnchor vertical leading disabled"
+          />
+          <div
+            class="tabs-container flex align-center"
+          >
+            <div
+              class="dockTabs"
+              role="tablist"
+            >
+              <div
+                class="Tabs tabs"
+              />
+            </div>
+            <div
+              class="toolbar flex gaps align-center box grow pl-0"
+            >
+              <div
+                class="dock-menu box grow"
+              >
+                <i
+                  class="Icon new-dock-tab material interactive focusable"
+                  id="menu-actions-for-dock"
+                  tabindex="0"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="add"
+                  >
+                    add
+                  </span>
+                </i>
+                <div>
+                  New tab
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <ul
+    class="Animate opacity Menu MenuActions flex HelmReleaseMenu right bottom portal enter"
+    id="menu-actions-for-release-menu-for-my-second-namespace/some-name"
+    style="--enter-duration: 100ms; --leave-duration: 100ms;"
+  >
+    <li
+      class="MenuItem"
+      data-testid="upgrade-chart-menu-item-for-my-second-namespace/some-name"
+      tabindex="0"
+    >
+      <i
+        class="Icon material focusable"
+      >
+        <span
+          class="icon"
+          data-icon-name="refresh"
+        >
+          refresh
+        </span>
+      </i>
+      <div>
+        Upgrade
+      </div>
+      <span
+        class="title"
+      >
+        Upgrade
+      </span>
+    </li>
+    <li
+      class="MenuItem"
+      data-testid="menu-action-remove"
+      tabindex="0"
+    >
+      <i
+        class="Icon material focusable"
+      >
+        <span
+          class="icon"
+          data-icon-name="delete"
+        >
+          delete
+        </span>
+      </i>
+      <div>
+        Delete
+      </div>
+      <span
+        class="title"
+      >
+        Delete
+      </span>
+    </li>
+  </ul>
+</body>
+`;
+
+exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navigating to the helm releases view when helm releases resolves when clicking the menu for a helm release when clicking the upgrade chart menu item renders 1`] = `
+<body>
+  <div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+    <div
+      class="mainLayout"
+      style="--sidebar-width: 200px;"
+    >
+      <div
+        class="sidebar"
+      >
+        <div
+          class="flex flex-col"
+          data-testid="cluster-sidebar"
+        >
+          <div
+            class="SidebarCluster"
+          >
+            <div
+              class="Avatar rounded loadingAvatar"
+              style="width: 40px; height: 40px;"
+            >
+              ??
+            </div>
+            <div
+              class="loadingClusterName"
+            />
+          </div>
+          <div
+            class="sidebarNav sidebar-active-status"
+          >
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-workloads"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-workloads"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Workloads
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-config"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-config"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="list"
+                  >
+                    list
+                  </span>
+                </i>
+                <span>
+                  Config
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-network"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-network"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="device_hub"
+                  >
+                    device_hub
+                  </span>
+                </i>
+                <span>
+                  Network
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-storage"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-storage"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="storage"
+                  >
+                    storage
+                  </span>
+                </i>
+                <span>
+                  Storage
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="true"
+              data-testid="sidebar-item-helm"
+            >
+              <a
+                aria-current="page"
+                class="navItem active"
+                data-testid="sidebar-item-link-for-helm"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Helm
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-user-management"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-user-management"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="security"
+                  >
+                    security
+                  </span>
+                </i>
+                <span>
+                  Access Control
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-custom-resources"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-custom-resources"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="extension"
+                  >
+                    extension
+                  </span>
+                </i>
+                <span>
+                  Custom Resources
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+          </div>
+        </div>
+        <div
+          class="ResizingAnchor horizontal trailing"
+        />
+      </div>
+      <div
+        class="contents"
+      >
+        <div
+          class="TabLayout"
+          data-testid="tab-layout"
+        >
+          <div
+            class="Tabs center scrollable"
+          >
+            <div
+              class="Tab flex gaps align-center"
+              data-is-active-test="false"
+              data-testid="tab-link-for-charts"
+              role="tab"
+              tabindex="0"
+            >
+              <div
+                class="label"
+              >
+                Charts
+              </div>
+            </div>
+            <div
+              class="Tab flex gaps align-center active"
+              data-is-active-test="true"
+              data-testid="tab-link-for-releases"
+              role="tab"
+              tabindex="0"
+            >
+              <div
+                class="label"
+              >
+                Releases
+              </div>
+            </div>
+          </div>
+          <main>
+            <div
+              class="ItemListLayout flex column HelmReleases"
+            >
+              <div
+                class="header flex gaps align-center"
+              >
+                <h5
+                  class="title"
+                >
+                  Releases
+                </h5>
+                <div
+                  class="info-panel box grow"
+                >
+                  1 item
+                </div>
+                <div
+                  class="NamespaceSelectFilterParent"
+                  data-testid="namespace-select-filter"
+                >
+                  <div
+                    class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-namespace-select-filter-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-namespace-select-filter-placeholder"
+                        >
+                          Namespace: my-second-namespace
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-namespace-select-filter-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="namespace-select-filter"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="Input SearchInput"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      placeholder="Search Releases..."
+                      spellcheck="false"
+                      value=""
+                    />
+                    <i
+                      class="Icon material focusable small"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="search"
+                      >
+                        search
+                      </span>
+                    </i>
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </div>
+              <div
+                class="items box grow flex column"
+              >
+                <div
+                  class="Table flex column HelmReleases box grow dark selectable scrollable sortable autoSize virtual"
+                >
+                  <div
+                    class="TableHead sticky nowrap topLine"
+                  >
+                    <div
+                      class="TableCell checkbox"
+                    >
+                      <label
+                        class="Checkbox flex align-center"
+                      >
+                        <input
+                          type="checkbox"
+                        />
+                        <i
+                          class="box flex align-center"
+                        />
+                      </label>
+                    </div>
+                    <div
+                      class="TableCell name nowrap sorting"
+                      id="name"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Name
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell namespace nowrap sorting"
+                      id="namespace"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Namespace
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell chart nowrap sorting"
+                      id="chart"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Chart
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell revision nowrap sorting"
+                      id="revision"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Revision
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell version nowrap"
+                      id="version"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Version
+                      </div>
+                    </div>
+                    <div
+                      class="TableCell app-version nowrap"
+                      id="app-version"
+                    >
+                      <div
+                        class="content"
+                      >
+                        App Version
+                      </div>
+                    </div>
+                    <div
+                      class="TableCell status nowrap sorting"
+                      id="status"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Status
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell updated nowrap sorting"
+                      id="update"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Updated
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell menu nowrap"
+                    >
+                      <div
+                        class="content"
+                      >
+                        <i
+                          class="Icon material interactive focusable"
+                          id="menu-actions-for-item-object-list-content"
+                          tabindex="0"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="more_vert"
+                          >
+                            more_vert
+                          </span>
+                        </i>
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    class="VirtualList HelmReleases box grow dark"
+                  >
+                    <div>
+                      <div
+                        class="list"
+                        style="position: relative; height: 420000px; width: 100%; overflow: auto; will-change: transform; direction: ltr;"
+                      >
+                        <div
+                          style="height: 33px; width: 100%;"
+                        >
+                          <div
+                            style="position: absolute; left: 0px; top: 0px; height: 33px; width: 100%;"
+                          >
+                            <div
+                              class="TableRow nowrap"
+                              data-testid="helm-release-row-for-my-second-namespace/some-name"
+                            >
+                              <div
+                                class="TableCell checkbox"
+                              >
+                                <label
+                                  class="Checkbox flex align-center"
+                                >
+                                  <input
+                                    type="checkbox"
+                                  />
+                                  <i
+                                    class="box flex align-center"
+                                  />
+                                </label>
+                              </div>
+                              <div
+                                class="TableCell name"
+                              >
+                                some-name
+                              </div>
+                              <div
+                                class="TableCell namespace"
+                              >
+                                my-second-namespace
+                              </div>
+                              <div
+                                class="TableCell chart"
+                              >
+                                some-chart
+                              </div>
+                              <div
+                                class="TableCell revision"
+                              >
+                                NaN
+                              </div>
+                              <div
+                                class="TableCell version"
+                              >
+                                1.0.0
+                              </div>
+                              <div
+                                class="TableCell app-version"
+                              >
+                                some-app-version
+                              </div>
+                              <div
+                                class="TableCell some-status status"
+                              >
+                                Some-status
+                              </div>
+                              <div
+                                class="TableCell updated"
+                              >
+                                NaNy
+                              </div>
+                              <div
+                                class="TableCell menu"
+                              >
+                                <div>
+                                  <i
+                                    class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-my-second-namespace/some-name"
+                                    id="menu-actions-for-release-menu-for-my-second-namespace/some-name"
+                                    tabindex="0"
+                                  >
+                                    <span
+                                      class="icon"
+                                      data-icon-name="more_vert"
+                                    >
+                                      more_vert
+                                    </span>
+                                  </i>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="AddRemoveButtons flex gaps"
+                />
+              </div>
+            </div>
+          </main>
+        </div>
+      </div>
+      <div
+        class="footer"
+      >
+        <div
+          class="Dock isOpen"
+          tabindex="-1"
+        >
+          <div
+            class="ResizingAnchor vertical leading"
+          />
+          <div
+            class="tabs-container flex align-center"
+          >
+            <div
+              class="dockTabs"
+              role="tablist"
+            >
+              <div
+                class="Tabs tabs"
+              >
+                <div
+                  class="Tab flex gaps align-center DockTab active"
+                  data-testid="dock-tab-for-some-irrelevant-random-id"
+                  id="tab-some-irrelevant-random-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <i
+                    class="Icon material focusable small"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="install_desktop"
+                    >
+                      install_desktop
+                    </span>
+                  </i>
+                  <div
+                    class="label"
+                  >
+                    <div
+                      class="flex align-center"
+                    >
+                      <span
+                        class="title"
+                      >
+                        Helm Upgrade: some-name
+                      </span>
+                      <div
+                        class="close"
+                      >
+                        <i
+                          class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-irrelevant-random-id"
+                          tabindex="0"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="close"
+                          >
+                            close
+                          </span>
+                        </i>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-irrelevant-random-id"
+                        >
+                          Close ⌘+W
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="toolbar flex gaps align-center box grow"
+            >
+              <div
+                class="dock-menu box grow"
+              >
+                <i
+                  class="Icon new-dock-tab material interactive focusable"
+                  id="menu-actions-for-dock"
+                  tabindex="0"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="add"
+                  >
+                    add
+                  </span>
+                </i>
+                <div>
+                  New tab
+                </div>
+              </div>
+              <i
+                class="Icon material interactive focusable"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="fullscreen"
+                >
+                  fullscreen
+                </span>
+              </i>
+              <div>
+                Fit to window
+              </div>
+              <i
+                class="Icon material interactive focusable"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+              <div>
+                Minimize
+              </div>
+            </div>
+          </div>
+          <div
+            class="tab-content upgrade-chart"
+            data-testid="dock-tab-content-for-some-irrelevant-random-id"
+            style="flex-basis: 300px;"
+          >
+            <div
+              class="Spinner singleColor center"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</body>
+`;
+
+exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navigating to the helm releases view when helm releases resolves when clicking the menu for a helm release when clicking the upgrade chart menu item when request for all helm charts resolves when the requests of versions of the helm charts resolves renders 1`] = `
+<body>
+  <div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+    <div
+      class="mainLayout"
+      style="--sidebar-width: 200px;"
+    >
+      <div
+        class="sidebar"
+      >
+        <div
+          class="flex flex-col"
+          data-testid="cluster-sidebar"
+        >
+          <div
+            class="SidebarCluster"
+          >
+            <div
+              class="Avatar rounded loadingAvatar"
+              style="width: 40px; height: 40px;"
+            >
+              ??
+            </div>
+            <div
+              class="loadingClusterName"
+            />
+          </div>
+          <div
+            class="sidebarNav sidebar-active-status"
+          >
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-workloads"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-workloads"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Workloads
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-config"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-config"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="list"
+                  >
+                    list
+                  </span>
+                </i>
+                <span>
+                  Config
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-network"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-network"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="device_hub"
+                  >
+                    device_hub
+                  </span>
+                </i>
+                <span>
+                  Network
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-storage"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-storage"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="storage"
+                  >
+                    storage
+                  </span>
+                </i>
+                <span>
+                  Storage
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="true"
+              data-testid="sidebar-item-helm"
+            >
+              <a
+                aria-current="page"
+                class="navItem active"
+                data-testid="sidebar-item-link-for-helm"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Helm
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-user-management"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-user-management"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="security"
+                  >
+                    security
+                  </span>
+                </i>
+                <span>
+                  Access Control
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-custom-resources"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-custom-resources"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="extension"
+                  >
+                    extension
+                  </span>
+                </i>
+                <span>
+                  Custom Resources
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+          </div>
+        </div>
+        <div
+          class="ResizingAnchor horizontal trailing"
+        />
+      </div>
+      <div
+        class="contents"
+      >
+        <div
+          class="TabLayout"
+          data-testid="tab-layout"
+        >
+          <div
+            class="Tabs center scrollable"
+          >
+            <div
+              class="Tab flex gaps align-center"
+              data-is-active-test="false"
+              data-testid="tab-link-for-charts"
+              role="tab"
+              tabindex="0"
+            >
+              <div
+                class="label"
+              >
+                Charts
+              </div>
+            </div>
+            <div
+              class="Tab flex gaps align-center active"
+              data-is-active-test="true"
+              data-testid="tab-link-for-releases"
+              role="tab"
+              tabindex="0"
+            >
+              <div
+                class="label"
+              >
+                Releases
+              </div>
+            </div>
+          </div>
+          <main>
+            <div
+              class="ItemListLayout flex column HelmReleases"
+            >
+              <div
+                class="header flex gaps align-center"
+              >
+                <h5
+                  class="title"
+                >
+                  Releases
+                </h5>
+                <div
+                  class="info-panel box grow"
+                >
+                  1 item
+                </div>
+                <div
+                  class="NamespaceSelectFilterParent"
+                  data-testid="namespace-select-filter"
+                >
+                  <div
+                    class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-namespace-select-filter-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-namespace-select-filter-placeholder"
+                        >
+                          Namespace: my-second-namespace
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-namespace-select-filter-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="namespace-select-filter"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="Input SearchInput"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      placeholder="Search Releases..."
+                      spellcheck="false"
+                      value=""
+                    />
+                    <i
+                      class="Icon material focusable small"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="search"
+                      >
+                        search
+                      </span>
+                    </i>
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </div>
+              <div
+                class="items box grow flex column"
+              >
+                <div
+                  class="Table flex column HelmReleases box grow dark selectable scrollable sortable autoSize virtual"
+                >
+                  <div
+                    class="TableHead sticky nowrap topLine"
+                  >
+                    <div
+                      class="TableCell checkbox"
+                    >
+                      <label
+                        class="Checkbox flex align-center"
+                      >
+                        <input
+                          type="checkbox"
+                        />
+                        <i
+                          class="box flex align-center"
+                        />
+                      </label>
+                    </div>
+                    <div
+                      class="TableCell name nowrap sorting"
+                      id="name"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Name
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell namespace nowrap sorting"
+                      id="namespace"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Namespace
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell chart nowrap sorting"
+                      id="chart"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Chart
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell revision nowrap sorting"
+                      id="revision"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Revision
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell version nowrap"
+                      id="version"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Version
+                      </div>
+                    </div>
+                    <div
+                      class="TableCell app-version nowrap"
+                      id="app-version"
+                    >
+                      <div
+                        class="content"
+                      >
+                        App Version
+                      </div>
+                    </div>
+                    <div
+                      class="TableCell status nowrap sorting"
+                      id="status"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Status
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell updated nowrap sorting"
+                      id="update"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Updated
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell menu nowrap"
+                    >
+                      <div
+                        class="content"
+                      >
+                        <i
+                          class="Icon material interactive focusable"
+                          id="menu-actions-for-item-object-list-content"
+                          tabindex="0"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="more_vert"
+                          >
+                            more_vert
+                          </span>
+                        </i>
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    class="VirtualList HelmReleases box grow dark"
+                  >
+                    <div>
+                      <div
+                        class="list"
+                        style="position: relative; height: 420000px; width: 100%; overflow: auto; will-change: transform; direction: ltr;"
+                      >
+                        <div
+                          style="height: 33px; width: 100%;"
+                        >
+                          <div
+                            style="position: absolute; left: 0px; top: 0px; height: 33px; width: 100%;"
+                          >
+                            <div
+                              class="TableRow nowrap"
+                              data-testid="helm-release-row-for-my-second-namespace/some-name"
+                            >
+                              <div
+                                class="TableCell checkbox"
+                              >
+                                <label
+                                  class="Checkbox flex align-center"
+                                >
+                                  <input
+                                    type="checkbox"
+                                  />
+                                  <i
+                                    class="box flex align-center"
+                                  />
+                                </label>
+                              </div>
+                              <div
+                                class="TableCell name"
+                              >
+                                some-name
+                              </div>
+                              <div
+                                class="TableCell namespace"
+                              >
+                                my-second-namespace
+                              </div>
+                              <div
+                                class="TableCell chart"
+                              >
+                                some-chart
+                              </div>
+                              <div
+                                class="TableCell revision"
+                              >
+                                NaN
+                              </div>
+                              <div
+                                class="TableCell version"
+                              >
+                                1.0.0
+                              </div>
+                              <div
+                                class="TableCell app-version"
+                              >
+                                some-app-version
+                              </div>
+                              <div
+                                class="TableCell some-status status"
+                              >
+                                Some-status
+                              </div>
+                              <div
+                                class="TableCell updated"
+                              >
+                                NaNy
+                              </div>
+                              <div
+                                class="TableCell menu"
+                              >
+                                <div>
+                                  <i
+                                    class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-my-second-namespace/some-name"
+                                    id="menu-actions-for-release-menu-for-my-second-namespace/some-name"
+                                    tabindex="0"
+                                  >
+                                    <span
+                                      class="icon"
+                                      data-icon-name="more_vert"
+                                    >
+                                      more_vert
+                                    </span>
+                                  </i>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="AddRemoveButtons flex gaps"
+                />
+              </div>
+            </div>
+          </main>
+        </div>
+      </div>
+      <div
+        class="footer"
+      >
+        <div
+          class="Dock isOpen"
+          tabindex="-1"
+        >
+          <div
+            class="ResizingAnchor vertical leading"
+          />
+          <div
+            class="tabs-container flex align-center"
+          >
+            <div
+              class="dockTabs"
+              role="tablist"
+            >
+              <div
+                class="Tabs tabs"
+              >
+                <div
+                  class="Tab flex gaps align-center DockTab active"
+                  data-testid="dock-tab-for-some-irrelevant-random-id"
+                  id="tab-some-irrelevant-random-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <i
+                    class="Icon material focusable small"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="install_desktop"
+                    >
+                      install_desktop
+                    </span>
+                  </i>
+                  <div
+                    class="label"
+                  >
+                    <div
+                      class="flex align-center"
+                    >
+                      <span
+                        class="title"
+                      >
+                        Helm Upgrade: some-name
+                      </span>
+                      <div
+                        class="close"
+                      >
+                        <i
+                          class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-irrelevant-random-id"
+                          tabindex="0"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="close"
+                          >
+                            close
+                          </span>
+                        </i>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-irrelevant-random-id"
+                        >
+                          Close ⌘+W
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="toolbar flex gaps align-center box grow"
+            >
+              <div
+                class="dock-menu box grow"
+              >
+                <i
+                  class="Icon new-dock-tab material interactive focusable"
+                  id="menu-actions-for-dock"
+                  tabindex="0"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="add"
+                  >
+                    add
+                  </span>
+                </i>
+                <div>
+                  New tab
+                </div>
+              </div>
+              <i
+                class="Icon material interactive focusable"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="fullscreen"
+                >
+                  fullscreen
+                </span>
+              </i>
+              <div>
+                Fit to window
+              </div>
+              <i
+                class="Icon material interactive focusable"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+              <div>
+                Minimize
+              </div>
+            </div>
+          </div>
+          <div
+            class="tab-content upgrade-chart"
+            data-testid="dock-tab-content-for-some-irrelevant-random-id"
+            style="flex-basis: 300px;"
+          >
+            <div
+              class="UpgradeChart flex column"
+              data-testid="upgrade-chart-dock-tab-contents-for-my-second-namespace/some-name"
+            >
+              <div
+                class="InfoPanel flex gaps align-center"
+              >
+                <div
+                  class="controls"
+                >
+                  <div
+                    class="upgrade flex gaps align-center"
+                  >
+                    <span>
+                      Release
+                    </span>
+                     
+                    <div
+                      class="badge"
+                    >
+                      some-name
+                    </div>
+                    <span>
+                      Namespace
+                    </span>
+                     
+                    <div
+                      class="badge"
+                    >
+                      my-second-namespace
+                    </div>
+                    <span>
+                      Version
+                    </span>
+                     
+                    <div
+                      class="badge"
+                    >
+                      1.0.0
+                    </div>
+                    <span>
+                      Upgrade version
+                    </span>
+                    <div
+                      class="Select theme-outlined chart-version css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-char-version-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control css-1s2u09g-control"
+                      >
+                        <div
+                          class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__single-value css-qc6sy-singleValue"
+                          >
+                            some-repo/some-chart-1.0.1
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="char-version-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="flex gaps align-center"
+                />
+                <button
+                  class="Button plain"
+                  type="button"
+                >
+                  Cancel
+                </button>
+                <button
+                  class="Button active outlined"
+                  type="button"
+                >
+                  Upgrade
+                </button>
+                <button
+                  class="Button primary active"
+                  type="button"
+                >
+                  Upgrade & Close
+                </button>
+              </div>
+              <textarea
+                data-testid="monaco-editor-for-some-irrelevant-random-id"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</body>
+`;
+
+exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navigating to the helm releases view when helm releases resolves when clicking the menu for a helm release when clicking the upgrade chart menu item when request for all helm charts resolves when the requests of versions of the helm charts resolves when the configuration request resolves renders 1`] = `
+<body>
+  <div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+    <div
+      class="mainLayout"
+      style="--sidebar-width: 200px;"
+    >
+      <div
+        class="sidebar"
+      >
+        <div
+          class="flex flex-col"
+          data-testid="cluster-sidebar"
+        >
+          <div
+            class="SidebarCluster"
+          >
+            <div
+              class="Avatar rounded loadingAvatar"
+              style="width: 40px; height: 40px;"
+            >
+              ??
+            </div>
+            <div
+              class="loadingClusterName"
+            />
+          </div>
+          <div
+            class="sidebarNav sidebar-active-status"
+          >
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-workloads"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-workloads"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Workloads
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-config"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-config"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="list"
+                  >
+                    list
+                  </span>
+                </i>
+                <span>
+                  Config
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-network"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-network"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="device_hub"
+                  >
+                    device_hub
+                  </span>
+                </i>
+                <span>
+                  Network
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-storage"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-storage"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="storage"
+                  >
+                    storage
+                  </span>
+                </i>
+                <span>
+                  Storage
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="true"
+              data-testid="sidebar-item-helm"
+            >
+              <a
+                aria-current="page"
+                class="navItem active"
+                data-testid="sidebar-item-link-for-helm"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Helm
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-user-management"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-user-management"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="security"
+                  >
+                    security
+                  </span>
+                </i>
+                <span>
+                  Access Control
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-custom-resources"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-custom-resources"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="extension"
+                  >
+                    extension
+                  </span>
+                </i>
+                <span>
+                  Custom Resources
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+          </div>
+        </div>
+        <div
+          class="ResizingAnchor horizontal trailing"
+        />
+      </div>
+      <div
+        class="contents"
+      >
+        <div
+          class="TabLayout"
+          data-testid="tab-layout"
+        >
+          <div
+            class="Tabs center scrollable"
+          >
+            <div
+              class="Tab flex gaps align-center"
+              data-is-active-test="false"
+              data-testid="tab-link-for-charts"
+              role="tab"
+              tabindex="0"
+            >
+              <div
+                class="label"
+              >
+                Charts
+              </div>
+            </div>
+            <div
+              class="Tab flex gaps align-center active"
+              data-is-active-test="true"
+              data-testid="tab-link-for-releases"
+              role="tab"
+              tabindex="0"
+            >
+              <div
+                class="label"
+              >
+                Releases
+              </div>
+            </div>
+          </div>
+          <main>
+            <div
+              class="ItemListLayout flex column HelmReleases"
+            >
+              <div
+                class="header flex gaps align-center"
+              >
+                <h5
+                  class="title"
+                >
+                  Releases
+                </h5>
+                <div
+                  class="info-panel box grow"
+                >
+                  1 item
+                </div>
+                <div
+                  class="NamespaceSelectFilterParent"
+                  data-testid="namespace-select-filter"
+                >
+                  <div
+                    class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-namespace-select-filter-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-namespace-select-filter-placeholder"
+                        >
+                          Namespace: my-second-namespace
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-namespace-select-filter-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="namespace-select-filter"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="Input SearchInput"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      placeholder="Search Releases..."
+                      spellcheck="false"
+                      value=""
+                    />
+                    <i
+                      class="Icon material focusable small"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="search"
+                      >
+                        search
+                      </span>
+                    </i>
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </div>
+              <div
+                class="items box grow flex column"
+              >
+                <div
+                  class="Table flex column HelmReleases box grow dark selectable scrollable sortable autoSize virtual"
+                >
+                  <div
+                    class="TableHead sticky nowrap topLine"
+                  >
+                    <div
+                      class="TableCell checkbox"
+                    >
+                      <label
+                        class="Checkbox flex align-center"
+                      >
+                        <input
+                          type="checkbox"
+                        />
+                        <i
+                          class="box flex align-center"
+                        />
+                      </label>
+                    </div>
+                    <div
+                      class="TableCell name nowrap sorting"
+                      id="name"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Name
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell namespace nowrap sorting"
+                      id="namespace"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Namespace
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell chart nowrap sorting"
+                      id="chart"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Chart
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell revision nowrap sorting"
+                      id="revision"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Revision
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell version nowrap"
+                      id="version"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Version
+                      </div>
+                    </div>
+                    <div
+                      class="TableCell app-version nowrap"
+                      id="app-version"
+                    >
+                      <div
+                        class="content"
+                      >
+                        App Version
+                      </div>
+                    </div>
+                    <div
+                      class="TableCell status nowrap sorting"
+                      id="status"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Status
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell updated nowrap sorting"
+                      id="update"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Updated
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell menu nowrap"
+                    >
+                      <div
+                        class="content"
+                      >
+                        <i
+                          class="Icon material interactive focusable"
+                          id="menu-actions-for-item-object-list-content"
+                          tabindex="0"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="more_vert"
+                          >
+                            more_vert
+                          </span>
+                        </i>
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    class="VirtualList HelmReleases box grow dark"
+                  >
+                    <div>
+                      <div
+                        class="list"
+                        style="position: relative; height: 420000px; width: 100%; overflow: auto; will-change: transform; direction: ltr;"
+                      >
+                        <div
+                          style="height: 33px; width: 100%;"
+                        >
+                          <div
+                            style="position: absolute; left: 0px; top: 0px; height: 33px; width: 100%;"
+                          >
+                            <div
+                              class="TableRow nowrap"
+                              data-testid="helm-release-row-for-my-second-namespace/some-name"
+                            >
+                              <div
+                                class="TableCell checkbox"
+                              >
+                                <label
+                                  class="Checkbox flex align-center"
+                                >
+                                  <input
+                                    type="checkbox"
+                                  />
+                                  <i
+                                    class="box flex align-center"
+                                  />
+                                </label>
+                              </div>
+                              <div
+                                class="TableCell name"
+                              >
+                                some-name
+                              </div>
+                              <div
+                                class="TableCell namespace"
+                              >
+                                my-second-namespace
+                              </div>
+                              <div
+                                class="TableCell chart"
+                              >
+                                some-chart
+                              </div>
+                              <div
+                                class="TableCell revision"
+                              >
+                                NaN
+                              </div>
+                              <div
+                                class="TableCell version"
+                              >
+                                1.0.0
+                              </div>
+                              <div
+                                class="TableCell app-version"
+                              >
+                                some-app-version
+                              </div>
+                              <div
+                                class="TableCell some-status status"
+                              >
+                                Some-status
+                              </div>
+                              <div
+                                class="TableCell updated"
+                              >
+                                NaNy
+                              </div>
+                              <div
+                                class="TableCell menu"
+                              >
+                                <div>
+                                  <i
+                                    class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-my-second-namespace/some-name"
+                                    id="menu-actions-for-release-menu-for-my-second-namespace/some-name"
+                                    tabindex="0"
+                                  >
+                                    <span
+                                      class="icon"
+                                      data-icon-name="more_vert"
+                                    >
+                                      more_vert
+                                    </span>
+                                  </i>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="AddRemoveButtons flex gaps"
+                />
+              </div>
+            </div>
+          </main>
+        </div>
+      </div>
+      <div
+        class="footer"
+      >
+        <div
+          class="Dock isOpen"
+          tabindex="-1"
+        >
+          <div
+            class="ResizingAnchor vertical leading"
+          />
+          <div
+            class="tabs-container flex align-center"
+          >
+            <div
+              class="dockTabs"
+              role="tablist"
+            >
+              <div
+                class="Tabs tabs"
+              >
+                <div
+                  class="Tab flex gaps align-center DockTab active"
+                  data-testid="dock-tab-for-some-irrelevant-random-id"
+                  id="tab-some-irrelevant-random-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <i
+                    class="Icon material focusable small"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="install_desktop"
+                    >
+                      install_desktop
+                    </span>
+                  </i>
+                  <div
+                    class="label"
+                  >
+                    <div
+                      class="flex align-center"
+                    >
+                      <span
+                        class="title"
+                      >
+                        Helm Upgrade: some-name
+                      </span>
+                      <div
+                        class="close"
+                      >
+                        <i
+                          class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-irrelevant-random-id"
+                          tabindex="0"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="close"
+                          >
+                            close
+                          </span>
+                        </i>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-irrelevant-random-id"
+                        >
+                          Close ⌘+W
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="toolbar flex gaps align-center box grow"
+            >
+              <div
+                class="dock-menu box grow"
+              >
+                <i
+                  class="Icon new-dock-tab material interactive focusable"
+                  id="menu-actions-for-dock"
+                  tabindex="0"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="add"
+                  >
+                    add
+                  </span>
+                </i>
+                <div>
+                  New tab
+                </div>
+              </div>
+              <i
+                class="Icon material interactive focusable"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="fullscreen"
+                >
+                  fullscreen
+                </span>
+              </i>
+              <div>
+                Fit to window
+              </div>
+              <i
+                class="Icon material interactive focusable"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+              <div>
+                Minimize
+              </div>
+            </div>
+          </div>
+          <div
+            class="tab-content upgrade-chart"
+            data-testid="dock-tab-content-for-some-irrelevant-random-id"
+            style="flex-basis: 300px;"
+          >
+            <div
+              class="UpgradeChart flex column"
+              data-testid="upgrade-chart-dock-tab-contents-for-my-second-namespace/some-name"
+            >
+              <div
+                class="InfoPanel flex gaps align-center"
+              >
+                <div
+                  class="controls"
+                >
+                  <div
+                    class="upgrade flex gaps align-center"
+                  >
+                    <span>
+                      Release
+                    </span>
+                     
+                    <div
+                      class="badge"
+                    >
+                      some-name
+                    </div>
+                    <span>
+                      Namespace
+                    </span>
+                     
+                    <div
+                      class="badge"
+                    >
+                      my-second-namespace
+                    </div>
+                    <span>
+                      Version
+                    </span>
+                     
+                    <div
+                      class="badge"
+                    >
+                      1.0.0
+                    </div>
+                    <span>
+                      Upgrade version
+                    </span>
+                    <div
+                      class="Select theme-outlined chart-version css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-char-version-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control css-1s2u09g-control"
+                      >
+                        <div
+                          class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__single-value css-qc6sy-singleValue"
+                          >
+                            some-repo/some-chart-1.0.1
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="char-version-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="flex gaps align-center"
+                />
+                <button
+                  class="Button plain"
+                  type="button"
+                >
+                  Cancel
+                </button>
+                <button
+                  class="Button active outlined"
+                  type="button"
+                >
+                  Upgrade
+                </button>
+                <button
+                  class="Button primary active"
+                  type="button"
+                >
+                  Upgrade & Close
+                </button>
+              </div>
+              <textarea
+                data-testid="monaco-editor-for-some-irrelevant-random-id"
+              >
+                some confiration for the helm release
+              </textarea>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</body>
+`;
+
+exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navigating to the helm releases view when helm releases resolves when clicking the menu for a helm release when clicking the upgrade chart menu item when request for all helm charts resolves when the requests of versions of the helm charts resolves when the configuration request resolves when closing the upgrade chart tab renders 1`] = `
+<body>
+  <div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+    <div
+      class="mainLayout"
+      style="--sidebar-width: 200px;"
+    >
+      <div
+        class="sidebar"
+      >
+        <div
+          class="flex flex-col"
+          data-testid="cluster-sidebar"
+        >
+          <div
+            class="SidebarCluster"
+          >
+            <div
+              class="Avatar rounded loadingAvatar"
+              style="width: 40px; height: 40px;"
+            >
+              ??
+            </div>
+            <div
+              class="loadingClusterName"
+            />
+          </div>
+          <div
+            class="sidebarNav sidebar-active-status"
+          >
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-workloads"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-workloads"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Workloads
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-config"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-config"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="list"
+                  >
+                    list
+                  </span>
+                </i>
+                <span>
+                  Config
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-network"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-network"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="device_hub"
+                  >
+                    device_hub
+                  </span>
+                </i>
+                <span>
+                  Network
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-storage"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-storage"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="storage"
+                  >
+                    storage
+                  </span>
+                </i>
+                <span>
+                  Storage
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="true"
+              data-testid="sidebar-item-helm"
+            >
+              <a
+                aria-current="page"
+                class="navItem active"
+                data-testid="sidebar-item-link-for-helm"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Helm
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-user-management"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-user-management"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="security"
+                  >
+                    security
+                  </span>
+                </i>
+                <span>
+                  Access Control
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-custom-resources"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-custom-resources"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="extension"
+                  >
+                    extension
+                  </span>
+                </i>
+                <span>
+                  Custom Resources
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+          </div>
+        </div>
+        <div
+          class="ResizingAnchor horizontal trailing"
+        />
+      </div>
+      <div
+        class="contents"
+      >
+        <div
+          class="TabLayout"
+          data-testid="tab-layout"
+        >
+          <div
+            class="Tabs center scrollable"
+          >
+            <div
+              class="Tab flex gaps align-center"
+              data-is-active-test="false"
+              data-testid="tab-link-for-charts"
+              role="tab"
+              tabindex="0"
+            >
+              <div
+                class="label"
+              >
+                Charts
+              </div>
+            </div>
+            <div
+              class="Tab flex gaps align-center active"
+              data-is-active-test="true"
+              data-testid="tab-link-for-releases"
+              role="tab"
+              tabindex="0"
+            >
+              <div
+                class="label"
+              >
+                Releases
+              </div>
+            </div>
+          </div>
+          <main>
+            <div
+              class="ItemListLayout flex column HelmReleases"
+            >
+              <div
+                class="header flex gaps align-center"
+              >
+                <h5
+                  class="title"
+                >
+                  Releases
+                </h5>
+                <div
+                  class="info-panel box grow"
+                >
+                  1 item
+                </div>
+                <div
+                  class="NamespaceSelectFilterParent"
+                  data-testid="namespace-select-filter"
+                >
+                  <div
+                    class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-namespace-select-filter-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-namespace-select-filter-placeholder"
+                        >
+                          Namespace: my-second-namespace
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-namespace-select-filter-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="namespace-select-filter"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="Input SearchInput"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      placeholder="Search Releases..."
+                      spellcheck="false"
+                      value=""
+                    />
+                    <i
+                      class="Icon material focusable small"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="search"
+                      >
+                        search
+                      </span>
+                    </i>
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </div>
+              <div
+                class="items box grow flex column"
+              >
+                <div
+                  class="Table flex column HelmReleases box grow dark selectable scrollable sortable autoSize virtual"
+                >
+                  <div
+                    class="TableHead sticky nowrap topLine"
+                  >
+                    <div
+                      class="TableCell checkbox"
+                    >
+                      <label
+                        class="Checkbox flex align-center"
+                      >
+                        <input
+                          type="checkbox"
+                        />
+                        <i
+                          class="box flex align-center"
+                        />
+                      </label>
+                    </div>
+                    <div
+                      class="TableCell name nowrap sorting"
+                      id="name"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Name
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell namespace nowrap sorting"
+                      id="namespace"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Namespace
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell chart nowrap sorting"
+                      id="chart"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Chart
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell revision nowrap sorting"
+                      id="revision"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Revision
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell version nowrap"
+                      id="version"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Version
+                      </div>
+                    </div>
+                    <div
+                      class="TableCell app-version nowrap"
+                      id="app-version"
+                    >
+                      <div
+                        class="content"
+                      >
+                        App Version
+                      </div>
+                    </div>
+                    <div
+                      class="TableCell status nowrap sorting"
+                      id="status"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Status
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell updated nowrap sorting"
+                      id="update"
+                    >
+                      <div
+                        class="content"
+                      >
+                        Updated
+                      </div>
+                      <i
+                        class="Icon sortIcon material focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="arrow_drop_down"
+                        >
+                          arrow_drop_down
+                        </span>
+                      </i>
+                    </div>
+                    <div
+                      class="TableCell menu nowrap"
+                    >
+                      <div
+                        class="content"
+                      >
+                        <i
+                          class="Icon material interactive focusable"
+                          id="menu-actions-for-item-object-list-content"
+                          tabindex="0"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="more_vert"
+                          >
+                            more_vert
+                          </span>
+                        </i>
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    class="VirtualList HelmReleases box grow dark"
+                  >
+                    <div>
+                      <div
+                        class="list"
+                        style="position: relative; height: 420000px; width: 100%; overflow: auto; will-change: transform; direction: ltr;"
+                      >
+                        <div
+                          style="height: 33px; width: 100%;"
+                        >
+                          <div
+                            style="position: absolute; left: 0px; top: 0px; height: 33px; width: 100%;"
+                          >
+                            <div
+                              class="TableRow nowrap"
+                              data-testid="helm-release-row-for-my-second-namespace/some-name"
+                            >
+                              <div
+                                class="TableCell checkbox"
+                              >
+                                <label
+                                  class="Checkbox flex align-center"
+                                >
+                                  <input
+                                    type="checkbox"
+                                  />
+                                  <i
+                                    class="box flex align-center"
+                                  />
+                                </label>
+                              </div>
+                              <div
+                                class="TableCell name"
+                              >
+                                some-name
+                              </div>
+                              <div
+                                class="TableCell namespace"
+                              >
+                                my-second-namespace
+                              </div>
+                              <div
+                                class="TableCell chart"
+                              >
+                                some-chart
+                              </div>
+                              <div
+                                class="TableCell revision"
+                              >
+                                NaN
+                              </div>
+                              <div
+                                class="TableCell version"
+                              >
+                                1.0.0
+                              </div>
+                              <div
+                                class="TableCell app-version"
+                              >
+                                some-app-version
+                              </div>
+                              <div
+                                class="TableCell some-status status"
+                              >
+                                Some-status
+                              </div>
+                              <div
+                                class="TableCell updated"
+                              >
+                                NaNy
+                              </div>
+                              <div
+                                class="TableCell menu"
+                              >
+                                <div>
+                                  <i
+                                    class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-my-second-namespace/some-name"
+                                    id="menu-actions-for-release-menu-for-my-second-namespace/some-name"
+                                    tabindex="0"
+                                  >
+                                    <span
+                                      class="icon"
+                                      data-icon-name="more_vert"
+                                    >
+                                      more_vert
+                                    </span>
+                                  </i>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="AddRemoveButtons flex gaps"
+                />
+              </div>
+            </div>
+          </main>
+        </div>
+      </div>
+      <div
+        class="footer"
+      >
+        <div
+          class="Dock"
+          tabindex="-1"
+        >
+          <div
+            class="ResizingAnchor vertical leading disabled"
+          />
+          <div
+            class="tabs-container flex align-center"
+          >
+            <div
+              class="dockTabs"
+              role="tablist"
+            >
+              <div
+                class="Tabs tabs"
+              />
+            </div>
+            <div
+              class="toolbar flex gaps align-center box grow pl-0"
+            >
+              <div
+                class="dock-menu box grow"
+              >
+                <i
+                  class="Icon new-dock-tab material interactive focusable"
+                  id="menu-actions-for-dock"
+                  tabindex="0"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="add"
+                  >
+                    add
+                  </span>
+                </i>
+                <div>
+                  New tab
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</body>
+`;
diff --git a/src/features/helm-charts/upgrade-chart/upgrade-chart-new-tab.test.ts b/src/features/helm-charts/upgrade-chart/upgrade-chart-new-tab.test.ts
new file mode 100644
index 0000000000..c58cf24ba2
--- /dev/null
+++ b/src/features/helm-charts/upgrade-chart/upgrade-chart-new-tab.test.ts
@@ -0,0 +1,268 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { AsyncFnMock } from "@async-fn/jest";
+import asyncFn from "@async-fn/jest";
+import type { RenderResult } from "@testing-library/react";
+import type { NavigateToHelmReleases } from "../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable";
+import navigateToHelmReleasesInjectable from "../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable";
+import { HelmChart } from "../../../common/k8s-api/endpoints/helm-charts.api";
+import type { RequestHelmCharts } from "../../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable";
+import requestHelmChartsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable";
+import type { RequestHelmChartVersions } from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable";
+import requestHelmChartVersionsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable";
+import type { RequestHelmReleaseConfiguration } from "../../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable";
+import requestHelmReleaseConfigurationInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable";
+import type { RequestHelmReleases } from "../../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable";
+import requestHelmReleasesInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable";
+import { advanceFakeTime, useFakeTime } from "../../../common/test-utils/use-fake-time";
+import dockStoreInjectable from "../../../renderer/components/dock/dock/store.injectable";
+import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
+
+describe("New Upgrade Helm Chart Dock Tab", () => {
+  let builder: ApplicationBuilder;
+  let renderResult: RenderResult;
+  let requestHelmReleaseConfigurationMock: AsyncFnMock<RequestHelmReleaseConfiguration>;
+  let requestHelmReleasesMock: AsyncFnMock<RequestHelmReleases>;
+  let requestHelmChartsMock: AsyncFnMock<RequestHelmCharts>;
+  let requestHelmChartVersionsMock: AsyncFnMock<RequestHelmChartVersions>;
+  let navigateToHelmReleases: NavigateToHelmReleases;
+
+  beforeEach(async () => {
+    builder = getApplicationBuilder();
+    builder.setEnvironmentToClusterFrame();
+
+    builder.beforeWindowStart((windowDi) => {
+      requestHelmReleaseConfigurationMock = asyncFn();
+      windowDi.override(requestHelmReleaseConfigurationInjectable, () => requestHelmReleaseConfigurationMock);
+
+      requestHelmReleasesMock = asyncFn();
+      windowDi.override(requestHelmReleasesInjectable, () => requestHelmReleasesMock);
+
+      requestHelmChartsMock = asyncFn();
+      windowDi.override(requestHelmChartsInjectable, () => requestHelmChartsMock);
+
+      requestHelmChartVersionsMock = asyncFn();
+      windowDi.override(requestHelmChartVersionsInjectable, () => requestHelmChartVersionsMock);
+
+      navigateToHelmReleases = windowDi.inject(navigateToHelmReleasesInjectable);
+    });
+
+    useFakeTime("2020-01-12 12:00:00");
+
+    builder.namespaces.add("my-first-namespace");
+    builder.namespaces.add("my-second-namespace");
+
+    renderResult = await builder.render();
+
+    const dockStore = builder.applicationWindow.only.di.inject(dockStoreInjectable);
+
+    // TODO: Make TerminalWindow unit testable to allow realistic behaviour
+    dockStore.closeTab("terminal");
+  });
+
+  describe("given a namespace is selected", () => {
+    beforeEach(() => {
+      builder.namespaces.select("my-second-namespace");
+    });
+
+    describe("when navigating to the helm releases view", () => {
+      beforeEach(() => {
+        navigateToHelmReleases();
+      });
+
+      it("renders", () => {
+        expect(renderResult.baseElement).toMatchSnapshot();
+      });
+
+      it("requests helm releases for the selected namespace", () => {
+        expect(requestHelmReleasesMock).toBeCalledWith("my-second-namespace");
+      });
+
+      describe("when helm releases resolves", () => {
+        beforeEach(async () => {
+          await requestHelmReleasesMock.resolve([
+            {
+              appVersion: "some-app-version",
+              name: "some-name",
+              namespace: "my-second-namespace",
+              chart: "some-chart-1.0.0",
+              status: "some-status",
+              updated: "some-updated",
+              revision: "some-revision",
+            },
+          ]);
+        });
+
+        it("renders", () => {
+          expect(renderResult.baseElement).toMatchSnapshot();
+        });
+
+        describe("when clicking the menu for a helm release", () => {
+          beforeEach(() => {
+            const helmReleaseMenu = renderResult.getByTestId("menu-actions-icon-for-release-menu-for-my-second-namespace/some-name");
+
+            helmReleaseMenu.click();
+          });
+
+          it("renders", () => {
+            expect(renderResult.baseElement).toMatchSnapshot();
+          });
+
+          describe("when clicking the upgrade chart menu item", () => {
+            beforeEach(() => {
+              const upgradeHelmChartMenuItem = renderResult.getByTestId("upgrade-chart-menu-item-for-my-second-namespace/some-name");
+
+              upgradeHelmChartMenuItem.click();
+              advanceFakeTime(100);
+            });
+
+            it("renders", () => {
+              expect(renderResult.baseElement).toMatchSnapshot();
+            });
+
+            it("requests all helm charts", () => {
+              expect(requestHelmChartsMock).toBeCalled();
+            });
+
+            describe("when request for all helm charts resolves", () => {
+              beforeEach(async () => {
+                await requestHelmChartsMock.resolve([
+                  HelmChart.create({
+                    apiVersion: "1.2.3",
+                    version: "1.0.0",
+                    created: "at-some-time",
+                    name: "some-chart",
+                    repo: "some-repo",
+                  }),
+                  HelmChart.create({
+                    apiVersion: "1.2.3",
+                    version: "1.0.0",
+                    created: "at-some-third-time",
+                    name: "some-chart",
+                    repo: "some-third-repo",
+                  }),
+                  HelmChart.create({
+                    apiVersion: "1.2.3",
+                    version: "0.9.0",
+                    created: "at-some-other-time",
+                    name: "some-other-chart",
+                    repo: "some-repo",
+                  }),
+                ]);
+              });
+
+              it("requests versions of the helm charts", () => {
+                expect(requestHelmChartVersionsMock).toBeCalledWith(
+                  "some-repo",
+                  "some-chart",
+                );
+                expect(requestHelmChartVersionsMock).toBeCalledWith(
+                  "some-third-repo",
+                  "some-chart",
+                );
+              });
+
+              it("shows the dock tab of the upgrade chart tab", () => {
+                expect(renderResult.queryByTestId("dock-tab-content-for-some-irrelevant-random-id")).toBeInTheDocument();
+              });
+
+              it("does not yet show the dock contents of the upgrade chart tab", () => {
+                expect(renderResult.queryByTestId("upgrade-chart-dock-tab-contents-for-my-second-namespace/some-name")).not.toBeInTheDocument();
+              });
+
+              describe("when the requests of versions of the helm charts resolves", () => {
+                beforeEach(async () => {
+                  await requestHelmChartVersionsMock.resolveSpecific(
+                    ["some-repo", "some-chart"],
+                    [
+                      HelmChart.create({
+                        apiVersion: "1.2.3",
+                        version: "1.0.0",
+                        created: "at-some-time",
+                        name: "some-chart",
+                        repo: "some-repo",
+                      }),
+                      HelmChart.create({
+                        apiVersion: "1.2.3",
+                        version: "1.0.1",
+                        created: "at-some-time",
+                        name: "some-chart",
+                        repo: "some-repo",
+                      }),
+                    ],
+                  );
+
+                  await requestHelmChartVersionsMock.resolveSpecific(
+                    ["some-third-repo", "some-chart"],
+                    [
+                      HelmChart.create({
+                        apiVersion: "1.2.3",
+                        version: "0.9.0",
+                        created: "at-some-other-time",
+                        name: "some-other-chart",
+                        repo: "some-repo",
+                      }),
+                      HelmChart.create({
+                        apiVersion: "1.2.3",
+                        version: "0.9.1",
+                        created: "at-some-other-time",
+                        name: "some-other-chart",
+                        repo: "some-repo",
+                      }),
+                    ],
+                  );
+                });
+
+                it("renders", () => {
+                  expect(renderResult.baseElement).toMatchSnapshot();
+                });
+
+                it("shows the dock contents of the upgrade chart tab", () => {
+                  expect(renderResult.queryByTestId("upgrade-chart-dock-tab-contents-for-my-second-namespace/some-name")).toBeInTheDocument();
+                });
+
+                it("requests the configuration for the specific helm release", () => {
+                  expect(requestHelmReleaseConfigurationMock).toBeCalledWith(
+                    "some-name",
+                    "my-second-namespace",
+                    true,
+                  );
+                });
+
+                describe("when the configuration request resolves", () => {
+                  beforeEach(async () => {
+                    await requestHelmReleaseConfigurationMock.resolve("some confiration for the helm release");
+                  });
+
+                  it("renders", () => {
+                    expect(renderResult.baseElement).toMatchSnapshot();
+                  });
+
+                  describe("when closing the upgrade chart tab", () => {
+                    beforeEach(() => {
+                      const closeDockTab = renderResult.getByTestId("dock-tab-close-for-some-irrelevant-random-id");
+
+                      closeDockTab.click();
+                    });
+
+                    it("renders", () => {
+                      expect(renderResult.baseElement).toMatchSnapshot();
+                    });
+
+                    it("does so", () => {
+                      expect(renderResult.queryByTestId("dock-tab-content-for-some-irrelevant-random-id")).not.toBeInTheDocument();
+                    });
+                  });
+                });
+              });
+            });
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap b/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap
index ced68044ac..c45e3d30b6 100644
--- a/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap
+++ b/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap
@@ -661,6 +661,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -670,7 +671,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -1404,6 +1407,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -1413,7 +1417,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -2131,7 +2137,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                1.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -2154,6 +2160,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-namespace/some-name"
                                     id="menu-actions-for-release-menu-for-some-namespace/some-name"
                                     tabindex="0"
                                   >
@@ -2212,7 +2219,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                2.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -2235,6 +2242,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-other-namespace/some-other-name"
                                     id="menu-actions-for-release-menu-for-some-other-namespace/some-other-name"
                                     tabindex="0"
                                   >
@@ -2315,6 +2323,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -2324,7 +2333,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -3042,7 +3053,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                1.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -3065,6 +3076,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-namespace/some-name"
                                     id="menu-actions-for-release-menu-for-some-namespace/some-name"
                                     tabindex="0"
                                   >
@@ -3123,7 +3135,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                2.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -3146,6 +3158,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-other-namespace/some-other-name"
                                     id="menu-actions-for-release-menu-for-some-other-namespace/some-other-name"
                                     tabindex="0"
                                   >
@@ -3226,6 +3239,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -3235,7 +3249,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -4014,7 +4030,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                1.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -4037,6 +4053,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-namespace/some-name"
                                     id="menu-actions-for-release-menu-for-some-namespace/some-name"
                                     tabindex="0"
                                   >
@@ -4095,7 +4112,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                2.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -4118,6 +4135,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-other-namespace/some-other-name"
                                     id="menu-actions-for-release-menu-for-some-other-namespace/some-other-name"
                                     tabindex="0"
                                   >
@@ -4198,6 +4216,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -4207,7 +4226,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -4986,7 +5007,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                1.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -5009,6 +5030,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-namespace/some-name"
                                     id="menu-actions-for-release-menu-for-some-namespace/some-name"
                                     tabindex="0"
                                   >
@@ -5067,7 +5089,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                2.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -5090,6 +5112,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-other-namespace/some-other-name"
                                     id="menu-actions-for-release-menu-for-some-other-namespace/some-other-name"
                                     tabindex="0"
                                   >
@@ -5170,6 +5193,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -5179,7 +5203,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -5280,6 +5306,7 @@ exports[`showing details for helm release given application is started when navi
         >
           <li
             class="MenuItem"
+            data-testid="upgrade-chart-menu-item-for-some-namespace/some-name"
             tabindex="0"
           >
             <i
@@ -5365,7 +5392,7 @@ exports[`showing details for helm release given application is started when navi
                 class="flex gaps align-center"
               >
                 <span>
-                  some-chart
+                  some-chart-1.0.0
                 </span>
                 <button
                   class="Button box right upgrade primary"
@@ -5419,7 +5446,9 @@ exports[`showing details for helm release given application is started when navi
               <div
                 class="version flex gaps align-center"
               >
-                <span />
+                <span>
+                  1.0.0
+                </span>
               </div>
             </span>
           </div>
@@ -5523,11 +5552,6 @@ exports[`showing details for helm release given application is started when navi
                 >
                   Namespace
                 </div>
-                <div
-                  class="TableCell age"
-                >
-                  Age
-                </div>
               </div>
               <div
                 class="TableRow"
@@ -5542,11 +5566,6 @@ exports[`showing details for helm release given application is started when navi
                 >
                   some-namespace
                 </div>
-                <div
-                  class="TableCell age"
-                >
-                  0s
-                </div>
               </div>
             </div>
           </div>
@@ -6210,7 +6229,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                1.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -6233,6 +6252,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-namespace/some-name"
                                     id="menu-actions-for-release-menu-for-some-namespace/some-name"
                                     tabindex="0"
                                   >
@@ -6291,7 +6311,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                2.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -6314,6 +6334,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-other-namespace/some-other-name"
                                     id="menu-actions-for-release-menu-for-some-other-namespace/some-other-name"
                                     tabindex="0"
                                   >
@@ -6394,6 +6415,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -6403,7 +6425,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -6504,6 +6528,7 @@ exports[`showing details for helm release given application is started when navi
         >
           <li
             class="MenuItem"
+            data-testid="upgrade-chart-menu-item-for-some-namespace/some-name"
             tabindex="0"
           >
             <i
@@ -6589,7 +6614,7 @@ exports[`showing details for helm release given application is started when navi
                 class="flex gaps align-center"
               >
                 <span>
-                  some-chart
+                  some-chart-1.0.0
                 </span>
                 <button
                   class="Button box right upgrade primary"
@@ -6643,7 +6668,9 @@ exports[`showing details for helm release given application is started when navi
               <div
                 class="version flex gaps align-center"
               >
-                <span />
+                <span>
+                  1.0.0
+                </span>
               </div>
             </span>
           </div>
@@ -6747,11 +6774,6 @@ exports[`showing details for helm release given application is started when navi
                 >
                   Namespace
                 </div>
-                <div
-                  class="TableCell age"
-                >
-                  Age
-                </div>
               </div>
               <div
                 class="TableRow"
@@ -6766,11 +6788,6 @@ exports[`showing details for helm release given application is started when navi
                 >
                   some-namespace
                 </div>
-                <div
-                  class="TableCell age"
-                >
-                  0s
-                </div>
               </div>
             </div>
           </div>
@@ -7434,7 +7451,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                1.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -7457,6 +7474,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-namespace/some-name"
                                     id="menu-actions-for-release-menu-for-some-namespace/some-name"
                                     tabindex="0"
                                   >
@@ -7515,7 +7533,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                2.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -7538,6 +7556,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-other-namespace/some-other-name"
                                     id="menu-actions-for-release-menu-for-some-other-namespace/some-other-name"
                                     tabindex="0"
                                   >
@@ -7618,6 +7637,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -7627,7 +7647,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -7728,6 +7750,7 @@ exports[`showing details for helm release given application is started when navi
         >
           <li
             class="MenuItem"
+            data-testid="upgrade-chart-menu-item-for-some-namespace/some-name"
             tabindex="0"
           >
             <i
@@ -7813,7 +7836,7 @@ exports[`showing details for helm release given application is started when navi
                 class="flex gaps align-center"
               >
                 <span>
-                  some-chart
+                  some-chart-1.0.0
                 </span>
                 <button
                   class="Button box right upgrade primary"
@@ -7867,7 +7890,9 @@ exports[`showing details for helm release given application is started when navi
               <div
                 class="version flex gaps align-center"
               >
-                <span />
+                <span>
+                  1.0.0
+                </span>
               </div>
             </span>
           </div>
@@ -7971,11 +7996,6 @@ exports[`showing details for helm release given application is started when navi
                 >
                   Namespace
                 </div>
-                <div
-                  class="TableCell age"
-                >
-                  Age
-                </div>
               </div>
               <div
                 class="TableRow"
@@ -7990,11 +8010,6 @@ exports[`showing details for helm release given application is started when navi
                 >
                   some-namespace
                 </div>
-                <div
-                  class="TableCell age"
-                >
-                  0s
-                </div>
               </div>
             </div>
           </div>
@@ -8008,7 +8023,7 @@ exports[`showing details for helm release given application is started when navi
 </body>
 `;
 
-exports[`showing details for helm release given application is started when navigating to helm releases when releases resolve when selecting release to see details when call for release resolve with release when configuration resolves when changing the configuration when saving when update resolves with failure renders 1`] = `
+exports[`showing details for helm release given application is started when navigating to helm releases when releases resolve when selecting release to see details when call for release resolve with release when configuration resolves when changing the configuration when saving when requestHelmCharts resolves when requestHelmChartVersions resolves when update resolves with failure renders 1`] = `
 <body>
   <div>
     <div
@@ -8669,6 +8684,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -8678,7 +8694,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -8779,6 +8797,7 @@ exports[`showing details for helm release given application is started when navi
         >
           <li
             class="MenuItem"
+            data-testid="upgrade-chart-menu-item-for-some-namespace/some-name"
             tabindex="0"
           >
             <i
@@ -8864,7 +8883,7 @@ exports[`showing details for helm release given application is started when navi
                 class="flex gaps align-center"
               >
                 <span>
-                  some-chart
+                  some-chart-1.0.0
                 </span>
                 <button
                   class="Button box right upgrade primary"
@@ -8918,7 +8937,9 @@ exports[`showing details for helm release given application is started when navi
               <div
                 class="version flex gaps align-center"
               >
-                <span />
+                <span>
+                  1.0.0
+                </span>
               </div>
             </span>
           </div>
@@ -9022,11 +9043,6 @@ exports[`showing details for helm release given application is started when navi
                 >
                   Namespace
                 </div>
-                <div
-                  class="TableCell age"
-                >
-                  Age
-                </div>
               </div>
               <div
                 class="TableRow"
@@ -9041,11 +9057,6 @@ exports[`showing details for helm release given application is started when navi
                 >
                   some-namespace
                 </div>
-                <div
-                  class="TableCell age"
-                >
-                  0s
-                </div>
               </div>
             </div>
           </div>
@@ -9059,7 +9070,7 @@ exports[`showing details for helm release given application is started when navi
 </body>
 `;
 
-exports[`showing details for helm release given application is started when navigating to helm releases when releases resolve when selecting release to see details when call for release resolve with release when configuration resolves when changing the configuration when saving when update resolves with success renders 1`] = `
+exports[`showing details for helm release given application is started when navigating to helm releases when releases resolve when selecting release to see details when call for release resolve with release when configuration resolves when changing the configuration when saving when requestHelmCharts resolves when requestHelmChartVersions resolves when update resolves with success renders 1`] = `
 <body>
   <div>
     <div
@@ -9720,6 +9731,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -9729,7 +9741,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -9830,6 +9844,7 @@ exports[`showing details for helm release given application is started when navi
         >
           <li
             class="MenuItem"
+            data-testid="upgrade-chart-menu-item-for-some-namespace/some-name"
             tabindex="0"
           >
             <i
@@ -9915,7 +9930,7 @@ exports[`showing details for helm release given application is started when navi
                 class="flex gaps align-center"
               >
                 <span>
-                  some-chart
+                  some-chart-1.0.0
                 </span>
                 <button
                   class="Button box right upgrade primary"
@@ -9969,7 +9984,9 @@ exports[`showing details for helm release given application is started when navi
               <div
                 class="version flex gaps align-center"
               >
-                <span />
+                <span>
+                  1.0.0
+                </span>
               </div>
             </span>
           </div>
@@ -10075,11 +10092,6 @@ exports[`showing details for helm release given application is started when navi
                 >
                   Namespace
                 </div>
-                <div
-                  class="TableCell age"
-                >
-                  Age
-                </div>
               </div>
               <div
                 class="TableRow"
@@ -10094,11 +10106,6 @@ exports[`showing details for helm release given application is started when navi
                 >
                   some-namespace
                 </div>
-                <div
-                  class="TableCell age"
-                >
-                  0s
-                </div>
               </div>
             </div>
           </div>
@@ -10762,7 +10769,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                1.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -10785,6 +10792,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-namespace/some-name"
                                     id="menu-actions-for-release-menu-for-some-namespace/some-name"
                                     tabindex="0"
                                   >
@@ -10843,7 +10851,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                2.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -10866,6 +10874,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-other-namespace/some-other-name"
                                     id="menu-actions-for-release-menu-for-some-other-namespace/some-other-name"
                                     tabindex="0"
                                   >
@@ -10946,6 +10955,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -10955,7 +10965,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -11056,6 +11068,7 @@ exports[`showing details for helm release given application is started when navi
         >
           <li
             class="MenuItem"
+            data-testid="upgrade-chart-menu-item-for-some-namespace/some-name"
             tabindex="0"
           >
             <i
@@ -11141,7 +11154,7 @@ exports[`showing details for helm release given application is started when navi
                 class="flex gaps align-center"
               >
                 <span>
-                  some-chart
+                  some-chart-1.0.0
                 </span>
                 <button
                   class="Button box right upgrade primary"
@@ -11195,7 +11208,9 @@ exports[`showing details for helm release given application is started when navi
               <div
                 class="version flex gaps align-center"
               >
-                <span />
+                <span>
+                  1.0.0
+                </span>
               </div>
             </span>
           </div>
@@ -11299,11 +11314,6 @@ exports[`showing details for helm release given application is started when navi
                 >
                   Namespace
                 </div>
-                <div
-                  class="TableCell age"
-                >
-                  Age
-                </div>
               </div>
               <div
                 class="TableRow"
@@ -11318,11 +11328,6 @@ exports[`showing details for helm release given application is started when navi
                 >
                   some-namespace
                 </div>
-                <div
-                  class="TableCell age"
-                >
-                  0s
-                </div>
               </div>
             </div>
           </div>
@@ -11986,7 +11991,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                1.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -12009,6 +12014,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-namespace/some-name"
                                     id="menu-actions-for-release-menu-for-some-namespace/some-name"
                                     tabindex="0"
                                   >
@@ -12067,7 +12073,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                2.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -12090,6 +12096,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-other-namespace/some-other-name"
                                     id="menu-actions-for-release-menu-for-some-other-namespace/some-other-name"
                                     tabindex="0"
                                   >
@@ -12170,6 +12177,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -12179,7 +12187,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -12219,6 +12229,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-some-tab-id"
                           tabindex="0"
                         >
                           <span
@@ -12228,7 +12239,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-some-tab-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -12955,7 +12968,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                1.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -12978,6 +12991,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-namespace/some-name"
                                     id="menu-actions-for-release-menu-for-some-namespace/some-name"
                                     tabindex="0"
                                   >
@@ -13036,7 +13050,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                2.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -13059,6 +13073,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-other-namespace/some-other-name"
                                     id="menu-actions-for-release-menu-for-some-other-namespace/some-other-name"
                                     tabindex="0"
                                   >
@@ -13139,6 +13154,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -13148,7 +13164,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -13930,7 +13948,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                1.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -13953,6 +13971,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-namespace/some-name"
                                     id="menu-actions-for-release-menu-for-some-namespace/some-name"
                                     tabindex="0"
                                   >
@@ -14011,7 +14030,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                2.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -14034,6 +14053,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-other-namespace/some-other-name"
                                     id="menu-actions-for-release-menu-for-some-other-namespace/some-other-name"
                                     tabindex="0"
                                   >
@@ -14114,6 +14134,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -14123,7 +14144,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -14841,7 +14864,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                1.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -14864,6 +14887,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-namespace/some-name"
                                     id="menu-actions-for-release-menu-for-some-namespace/some-name"
                                     tabindex="0"
                                   >
@@ -14922,7 +14946,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                2.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -14945,6 +14969,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-other-namespace/some-other-name"
                                     id="menu-actions-for-release-menu-for-some-other-namespace/some-other-name"
                                     tabindex="0"
                                   >
@@ -15025,6 +15050,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -15034,7 +15060,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -15813,7 +15841,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                1.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -15836,6 +15864,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-namespace/some-name"
                                     id="menu-actions-for-release-menu-for-some-namespace/some-name"
                                     tabindex="0"
                                   >
@@ -15894,7 +15923,7 @@ exports[`showing details for helm release given application is started when navi
                               <div
                                 class="TableCell version"
                               >
-                                
+                                2.0.0
                               </div>
                               <div
                                 class="TableCell app-version"
@@ -15917,6 +15946,7 @@ exports[`showing details for helm release given application is started when navi
                                 <div>
                                   <i
                                     class="Icon material interactive focusable"
+                                    data-testid="menu-actions-icon-for-release-menu-for-some-other-namespace/some-other-name"
                                     id="menu-actions-for-release-menu-for-some-other-namespace/some-other-name"
                                     tabindex="0"
                                   >
@@ -15997,6 +16027,7 @@ exports[`showing details for helm release given application is started when navi
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-terminal"
                           tabindex="0"
                         >
                           <span
@@ -16006,7 +16037,9 @@ exports[`showing details for helm release given application is started when navi
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
diff --git a/src/features/helm-releases/showing-details-for-helm-release.test.ts b/src/features/helm-releases/showing-details-for-helm-release.test.ts
index 4a4dc27149..b743ce013a 100644
--- a/src/features/helm-releases/showing-details-for-helm-release.test.ts
+++ b/src/features/helm-releases/showing-details-for-helm-release.test.ts
@@ -9,27 +9,38 @@ import type { RenderResult } from "@testing-library/react";
 import { fireEvent } from "@testing-library/react";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
-import type { CallForHelmReleases } from "../../renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.injectable";
-import callForHelmReleasesInjectable from "../../renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.injectable";
-import namespaceStoreInjectable from "../../renderer/components/+namespaces/store.injectable";
-import type { NamespaceStore } from "../../renderer/components/+namespaces/store";
-import type { CallForHelmReleaseConfiguration } from "../../renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.injectable";
-import callForHelmReleaseConfigurationInjectable from "../../renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.injectable";
-import type { CallForHelmReleaseUpdate } from "../../renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.injectable";
-import callForHelmReleaseUpdateInjectable from "../../renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.injectable";
+import type { RequestHelmReleases } from "../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable";
+import requestHelmReleasesInjectable from "../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable";
+import type { RequestHelmReleaseConfiguration } from "../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable";
+import requestHelmReleaseConfigurationInjectable from "../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable";
+import type { RequestHelmReleaseUpdate } from "../../common/k8s-api/endpoints/helm-releases.api/request-update.injectable";
+import requestHelmReleaseUpdateInjectable from "../../common/k8s-api/endpoints/helm-releases.api/request-update.injectable";
 import { useFakeTime } from "../../common/test-utils/use-fake-time";
-import type { CallForHelmRelease, DetailedHelmRelease } from "../../renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release.injectable";
-import callForHelmReleaseInjectable from "../../renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release.injectable";
+import type { RequestDetailedHelmRelease } from "../../renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable";
+import requestDetailedHelmReleaseInjectable from "../../renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable";
 import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable";
 import showCheckedErrorInjectable from "../../renderer/components/notifications/show-checked-error.injectable";
 import getRandomUpgradeChartTabIdInjectable from "../../renderer/components/dock/upgrade-chart/get-random-upgrade-chart-tab-id.injectable";
+import type { RequestHelmCharts } from "../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable";
+import type { RequestHelmChartVersions } from "../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable";
+import type { RequestHelmChartReadme } from "../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable";
+import type { RequestHelmChartValues } from "../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable";
+import requestHelmChartsInjectable from "../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable";
+import requestHelmChartVersionsInjectable from "../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable";
+import requestHelmChartReadmeInjectable from "../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable";
+import requestHelmChartValuesInjectable from "../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable";
+import { HelmChart } from "../../common/k8s-api/endpoints/helm-charts.api";
 
 describe("showing details for helm release", () => {
   let builder: ApplicationBuilder;
-  let callForHelmReleasesMock: AsyncFnMock<CallForHelmReleases>;
-  let callForHelmReleaseMock: AsyncFnMock<CallForHelmRelease>;
-  let callForHelmReleaseConfigurationMock: AsyncFnMock<CallForHelmReleaseConfiguration>;
-  let callForHelmReleaseUpdateMock: AsyncFnMock<CallForHelmReleaseUpdate>;
+  let requestHelmReleasesMock: AsyncFnMock<RequestHelmReleases>;
+  let requestDetailedHelmReleaseMock: AsyncFnMock<RequestDetailedHelmRelease>;
+  let requestHelmReleaseConfigurationMock: AsyncFnMock<RequestHelmReleaseConfiguration>;
+  let requestHelmReleaseUpdateMock: AsyncFnMock<RequestHelmReleaseUpdate>;
+  let requestHelmChartsMock: AsyncFnMock<RequestHelmCharts>;
+  let requestHelmChartVersionsMock: AsyncFnMock<RequestHelmChartVersions>;
+  let requestHelmChartReadmeMock: AsyncFnMock<RequestHelmChartReadme>;
+  let requestHelmChartValuesMock: AsyncFnMock<RequestHelmChartValues>;
   let showSuccessNotificationMock: jest.Mock;
   let showCheckedErrorNotificationMock: jest.Mock;
 
@@ -40,60 +51,36 @@ describe("showing details for helm release", () => {
 
     builder.setEnvironmentToClusterFrame();
 
-    callForHelmReleasesMock = asyncFn();
-    callForHelmReleaseMock = asyncFn();
-    callForHelmReleaseConfigurationMock = asyncFn();
-    callForHelmReleaseUpdateMock = asyncFn();
+    requestHelmReleasesMock = asyncFn();
+    requestDetailedHelmReleaseMock = asyncFn();
+    requestHelmReleaseConfigurationMock = asyncFn();
+    requestHelmReleaseUpdateMock = asyncFn();
+    requestHelmChartsMock = asyncFn();
+    requestHelmChartVersionsMock = asyncFn();
+    requestHelmChartReadmeMock = asyncFn();
+    requestHelmChartValuesMock = asyncFn();
 
     showSuccessNotificationMock = jest.fn();
     showCheckedErrorNotificationMock = jest.fn();
 
     builder.beforeWindowStart((windowDi) => {
-      windowDi.override(
-        getRandomUpgradeChartTabIdInjectable,
-        () => () => "some-tab-id",
-      );
-
-      windowDi.override(
-        showSuccessNotificationInjectable,
-        () => showSuccessNotificationMock,
-      );
-
-      windowDi.override(
-        showCheckedErrorInjectable,
-        () => showCheckedErrorNotificationMock,
-      );
-
-      windowDi.override(
-        callForHelmReleasesInjectable,
-        () => callForHelmReleasesMock,
-      );
-
-      windowDi.override(
-        callForHelmReleaseInjectable,
-        () => callForHelmReleaseMock,
-      );
-
-      windowDi.override(
-        callForHelmReleaseConfigurationInjectable,
-        () => callForHelmReleaseConfigurationMock,
-      );
-
-      windowDi.override(
-        callForHelmReleaseUpdateInjectable,
-        () => callForHelmReleaseUpdateMock,
-      );
-
-      windowDi.override(
-        namespaceStoreInjectable,
-        () =>
-          ({
-            contextNamespaces: ["some-namespace", "some-other-namespace"],
-            items: [],
-            selectNamespaces: () => {},
-          } as unknown as NamespaceStore),
-      );
+      windowDi.override(getRandomUpgradeChartTabIdInjectable, () => () => "some-tab-id");
+      windowDi.override(showSuccessNotificationInjectable, () => showSuccessNotificationMock);
+      windowDi.override(showCheckedErrorInjectable, () => showCheckedErrorNotificationMock);
+      windowDi.override(requestHelmReleasesInjectable, () => requestHelmReleasesMock);
+      windowDi.override(requestDetailedHelmReleaseInjectable, () => requestDetailedHelmReleaseMock);
+      windowDi.override(requestHelmReleaseConfigurationInjectable, () => requestHelmReleaseConfigurationMock);
+      windowDi.override(requestHelmReleaseUpdateInjectable, () => requestHelmReleaseUpdateMock);
+      windowDi.override(requestHelmChartsInjectable, () => requestHelmChartsMock);
+      windowDi.override(requestHelmChartVersionsInjectable, () => requestHelmChartVersionsMock);
+      windowDi.override(requestHelmChartReadmeInjectable, () => requestHelmChartReadmeMock);
+      windowDi.override(requestHelmChartValuesInjectable, () => requestHelmChartValuesMock);
     });
+
+    builder.namespaces.add("some-namespace");
+    builder.namespaces.select("some-namespace");
+    builder.namespaces.add("some-namespace");
+    builder.namespaces.select("some-other-namespace");
   });
 
   describe("given application is started", () => {
@@ -119,7 +106,7 @@ describe("showing details for helm release", () => {
       });
 
       it("calls for releases for each selected namespace", () => {
-        expect(callForHelmReleasesMock.mock.calls).toEqual([
+        expect(requestHelmReleasesMock.mock.calls).toEqual([
           ["some-namespace"],
           ["some-other-namespace"],
         ]);
@@ -132,22 +119,22 @@ describe("showing details for helm release", () => {
       });
 
       it("when releases resolve but there is none, renders", async () => {
-        await callForHelmReleasesMock.resolve([]);
-        await callForHelmReleasesMock.resolve([]);
+        await requestHelmReleasesMock.resolve([]);
+        await requestHelmReleasesMock.resolve([]);
 
         expect(rendered.baseElement).toMatchSnapshot();
       });
 
       describe("when releases resolve", () => {
         beforeEach(async () => {
-          await callForHelmReleasesMock.resolveSpecific(
+          await requestHelmReleasesMock.resolveSpecific(
             ([namespace]) => namespace === "some-namespace",
             [
               {
                 appVersion: "some-app-version",
                 name: "some-name",
                 namespace: "some-namespace",
-                chart: "some-chart",
+                chart: "some-chart-1.0.0",
                 status: "some-status",
                 updated: "some-updated",
                 revision: "some-revision",
@@ -155,14 +142,14 @@ describe("showing details for helm release", () => {
             ],
           );
 
-          await callForHelmReleasesMock.resolveSpecific(
+          await requestHelmReleasesMock.resolveSpecific(
             ([namespace]) => namespace === "some-other-namespace",
             [
               {
                 appVersion: "some-other-app-version",
                 name: "some-other-name",
                 namespace: "some-other-namespace",
-                chart: "some-other-chart",
+                chart: "some-other-chart-2.0.0",
                 status: "some-other-status",
                 updated: "some-other-updated",
                 revision: "some-other-revision",
@@ -201,7 +188,7 @@ describe("showing details for helm release", () => {
           });
 
           it("calls for release", () => {
-            expect(callForHelmReleaseMock).toHaveBeenCalledWith(
+            expect(requestDetailedHelmReleaseMock).toHaveBeenCalledWith(
               "some-name",
               "some-namespace",
             );
@@ -215,7 +202,7 @@ describe("showing details for helm release", () => {
 
           describe("when opening details for second release", () => {
             beforeEach(() => {
-              callForHelmReleaseMock.mockClear();
+              requestDetailedHelmReleaseMock.mockClear();
 
               const row = rendered.getByTestId(
                 "helm-release-row-for-some-other-namespace/some-other-name",
@@ -229,7 +216,7 @@ describe("showing details for helm release", () => {
             });
 
             it("calls for another release", () => {
-              expect(callForHelmReleaseMock).toHaveBeenCalledWith(
+              expect(requestDetailedHelmReleaseMock).toHaveBeenCalledWith(
                 "some-other-name",
                 "some-other-namespace",
               );
@@ -269,7 +256,7 @@ describe("showing details for helm release", () => {
 
             describe("when opening details for same release", () => {
               beforeEach(() => {
-                callForHelmReleaseMock.mockClear();
+                requestDetailedHelmReleaseMock.mockClear();
 
                 const row = rendered.getByTestId(
                   "helm-release-row-for-some-namespace/some-name",
@@ -283,15 +270,14 @@ describe("showing details for helm release", () => {
               });
 
               it("does not reload", () => {
-                expect(callForHelmReleaseMock).not.toHaveBeenCalled();
+                expect(requestDetailedHelmReleaseMock).not.toHaveBeenCalled();
               });
             });
           });
 
-
           describe("when call for release resolves with error", () => {
             beforeEach(async () => {
-              await callForHelmReleaseMock.resolve({
+              await requestDetailedHelmReleaseMock.resolve({
                 callWasSuccessful: false,
                 error: "some-error",
               });
@@ -314,15 +300,55 @@ describe("showing details for helm release", () => {
             });
 
             it("does not call for release configuration", () => {
-              expect(callForHelmReleaseConfigurationMock).not.toHaveBeenCalled();
+              expect(requestHelmReleaseConfigurationMock).not.toHaveBeenCalled();
             });
           });
 
           describe("when call for release resolve with release", () => {
             beforeEach(async () => {
-              await callForHelmReleaseMock.resolve({
+              await requestDetailedHelmReleaseMock.resolve({
                 callWasSuccessful: true,
-                response: detailedReleaseFake,
+                response: {
+                  release: {
+                    appVersion: "some-app-version",
+                    chart: "some-chart-1.0.0",
+                    status: "some-status",
+                    updated: "some-updated",
+                    revision: "some-revision",
+                    name: "some-name",
+                    namespace: "some-namespace",
+                  },
+
+                  details: {
+                    name: "some-name",
+                    namespace: "some-namespace",
+                    version: "some-version",
+                    config: "some-config",
+                    manifest: "some-manifest",
+
+                    info: {
+                      deleted: "some-deleted",
+                      description: "some-description",
+                      first_deployed: "some-first-deployed",
+                      last_deployed: "some-last-deployed",
+                      notes: "some-notes",
+                      status: "some-status",
+                    },
+
+                    resources: [
+                      {
+                        kind: "some-kind",
+                        apiVersion: "some-api-version",
+                        metadata: {
+                          uid: "some-uid",
+                          name: "some-resource",
+                          namespace: "some-namespace",
+                          creationTimestamp: "2015-10-22T07:28:00Z",
+                        },
+                      },
+                    ],
+                  },
+                },
               });
             });
 
@@ -331,7 +357,7 @@ describe("showing details for helm release", () => {
             });
 
             it("calls for release configuration", () => {
-              expect(callForHelmReleaseConfigurationMock).toHaveBeenCalledWith(
+              expect(requestHelmReleaseConfigurationMock).toHaveBeenCalledWith(
                 "some-name",
                 "some-namespace",
                 true,
@@ -340,7 +366,7 @@ describe("showing details for helm release", () => {
 
             describe("when configuration resolves", () => {
               beforeEach(async () => {
-                await callForHelmReleaseConfigurationMock.resolve(
+                await requestHelmReleaseConfigurationMock.resolve(
                   "some-configuration",
                 );
               });
@@ -405,12 +431,12 @@ describe("showing details for helm release", () => {
                 });
 
                 it("does not save changes yet", () => {
-                  expect(callForHelmReleaseUpdateMock).not.toHaveBeenCalled();
+                  expect(requestHelmReleaseUpdateMock).not.toHaveBeenCalled();
                 });
 
                 describe("when toggling to see only user defined values", () => {
                   beforeEach(() => {
-                    callForHelmReleaseConfigurationMock.mockClear();
+                    requestHelmReleaseConfigurationMock.mockClear();
 
                     const toggle = rendered.getByTestId(
                       "user-supplied-values-only-checkbox",
@@ -420,7 +446,7 @@ describe("showing details for helm release", () => {
                   });
 
                   it("calls for only user defined configuration", () => {
-                    expect(callForHelmReleaseConfigurationMock).toHaveBeenCalledWith(
+                    expect(requestHelmReleaseConfigurationMock).toHaveBeenCalledWith(
                       "some-name",
                       "some-namespace",
                       false,
@@ -429,7 +455,7 @@ describe("showing details for helm release", () => {
 
                   describe("when configuration resolves", () => {
                     beforeEach(async () => {
-                      await callForHelmReleaseConfigurationMock.resolve(
+                      await requestHelmReleaseConfigurationMock.resolve(
                         "some-other-configuration",
                       );
                     });
@@ -447,7 +473,7 @@ describe("showing details for helm release", () => {
                     });
 
                     it("when toggling again, calls for all configuration", () => {
-                      callForHelmReleaseConfigurationMock.mockClear();
+                      requestHelmReleaseConfigurationMock.mockClear();
 
                       const toggle = rendered.getByTestId(
                         "user-supplied-values-only-checkbox",
@@ -455,7 +481,7 @@ describe("showing details for helm release", () => {
 
                       fireEvent.click(toggle);
 
-                      expect(callForHelmReleaseConfigurationMock).toHaveBeenCalledWith(
+                      expect(requestHelmReleaseConfigurationMock).toHaveBeenCalledWith(
                         "some-name",
                         "some-namespace",
                         true,
@@ -477,20 +503,6 @@ describe("showing details for helm release", () => {
                     expect(rendered.baseElement).toMatchSnapshot();
                   });
 
-                  it("calls for update", () => {
-                    expect(callForHelmReleaseUpdateMock).toHaveBeenCalledWith(
-                      "some-name",
-                      "some-namespace",
-
-                      {
-                        chart: "some-chart",
-                        repo: "",
-                        values: "some-new-configuration",
-                        version: "",
-                      },
-                    );
-                  });
-
                   it("shows spinner", () => {
                     const saveButton = rendered.getByTestId(
                       "helm-release-configuration-save-button",
@@ -499,78 +511,115 @@ describe("showing details for helm release", () => {
                     expect(saveButton).toHaveClass("waiting");
                   });
 
-                  describe("when update resolves with success", () => {
+                  describe("when requestHelmCharts resolves", () => {
                     beforeEach(async () => {
-                      callForHelmReleasesMock.mockClear();
-                      callForHelmReleaseConfigurationMock.mockClear();
-
-                      await callForHelmReleaseUpdateMock.resolve({
-                        updateWasSuccessful: true,
+                      await requestHelmChartsMock.resolve([HelmChart.create({
+                        apiVersion: "1.2.3",
+                        version: "1.0.0",
+                        created: "at-some-time",
+                        name: "some-chart",
+                        repo: "some-repo",
+                      })]);
+                    });
+                    describe("when requestHelmChartVersions resolves", () => {
+                      beforeEach(async () => {
+                        await requestHelmChartVersionsMock.resolve([HelmChart.create({
+                          apiVersion: "1.2.3",
+                          version: "1.0.0",
+                          created: "at-some-time",
+                          name: "some-chart",
+                          repo: "some-repo",
+                        })]);
                       });
-                    });
 
-                    it("renders", () => {
-                      expect(rendered.baseElement).toMatchSnapshot();
-                    });
+                      it("calls for update", () => {
+                        expect(requestHelmReleaseUpdateMock).toHaveBeenCalledWith(
+                          "some-name",
+                          "some-namespace",
 
-                    it("does not show spinner anymore", () => {
-                      const saveButton = rendered.getByTestId(
-                        "helm-release-configuration-save-button",
-                      );
-
-                      expect(saveButton).not.toHaveClass("waiting");
-                    });
-
-                    it("reloads the configuration", () => {
-                      expect(callForHelmReleaseConfigurationMock).toHaveBeenCalledWith(
-                        "some-name",
-                        "some-namespace",
-                        true,
-                      );
-                    });
-
-                    it("shows success notification", () => {
-                      expect(showSuccessNotificationMock).toHaveBeenCalled();
-                    });
-
-                    it("does not show error notification", () => {
-                      expect(showCheckedErrorNotificationMock).not.toHaveBeenCalled();
-                    });
-                  });
-
-                  describe("when update resolves with failure", () => {
-                    beforeEach(async () => {
-                      callForHelmReleasesMock.mockClear();
-                      callForHelmReleaseConfigurationMock.mockClear();
-
-                      await callForHelmReleaseUpdateMock.resolve({
-                        updateWasSuccessful: false,
-                        error: "some-error",
+                          {
+                            chart: "some-chart",
+                            repo: "some-repo",
+                            values: "some-new-configuration",
+                            version: "1.0.0",
+                          },
+                        );
                       });
-                    });
 
-                    it("renders", () => {
-                      expect(rendered.baseElement).toMatchSnapshot();
-                    });
+                      describe("when update resolves with success", () => {
+                        beforeEach(async () => {
+                          requestHelmReleasesMock.mockClear();
+                          requestHelmReleaseConfigurationMock.mockClear();
 
-                    it("does not show spinner anymore", () => {
-                      const saveButton = rendered.getByTestId(
-                        "helm-release-configuration-save-button",
-                      );
+                          await requestHelmReleaseUpdateMock.resolve({
+                            callWasSuccessful: true,
+                          });
+                        });
 
-                      expect(saveButton).not.toHaveClass("waiting");
-                    });
+                        it("renders", () => {
+                          expect(rendered.baseElement).toMatchSnapshot();
+                        });
 
-                    it("does not reload the configuration", () => {
-                      expect(callForHelmReleaseConfigurationMock).not.toHaveBeenCalled();
-                    });
+                        it("does not show spinner anymore", () => {
+                          const saveButton = rendered.getByTestId(
+                            "helm-release-configuration-save-button",
+                          );
 
-                    it("does not show success notification", () => {
-                      expect(showSuccessNotificationMock).not.toHaveBeenCalled();
-                    });
+                          expect(saveButton).not.toHaveClass("waiting");
+                        });
 
-                    it("shows error notification", () => {
-                      expect(showCheckedErrorNotificationMock).toHaveBeenCalled();
+                        it("reloads the configuration", () => {
+                          expect(requestHelmReleaseConfigurationMock).toHaveBeenCalledWith(
+                            "some-name",
+                            "some-namespace",
+                            true,
+                          );
+                        });
+
+                        it("shows success notification", () => {
+                          expect(showSuccessNotificationMock).toHaveBeenCalled();
+                        });
+
+                        it("does not show error notification", () => {
+                          expect(showCheckedErrorNotificationMock).not.toHaveBeenCalled();
+                        });
+                      });
+
+                      describe("when update resolves with failure", () => {
+                        beforeEach(async () => {
+                          requestHelmReleasesMock.mockClear();
+                          requestHelmReleaseConfigurationMock.mockClear();
+
+                          await requestHelmReleaseUpdateMock.resolve({
+                            callWasSuccessful: false,
+                            error: "some-error",
+                          });
+                        });
+
+                        it("renders", () => {
+                          expect(rendered.baseElement).toMatchSnapshot();
+                        });
+
+                        it("does not show spinner anymore", () => {
+                          const saveButton = rendered.getByTestId(
+                            "helm-release-configuration-save-button",
+                          );
+
+                          expect(saveButton).not.toHaveClass("waiting");
+                        });
+
+                        it("does not reload the configuration", () => {
+                          expect(requestHelmReleaseConfigurationMock).not.toHaveBeenCalled();
+                        });
+
+                        it("does not show success notification", () => {
+                          expect(showSuccessNotificationMock).not.toHaveBeenCalled();
+                        });
+
+                        it("shows error notification", () => {
+                          expect(showCheckedErrorNotificationMock).toHaveBeenCalled();
+                        });
+                      });
                     });
                   });
                 });
@@ -582,45 +631,3 @@ describe("showing details for helm release", () => {
     });
   });
 });
-
-const detailedReleaseFake: DetailedHelmRelease = {
-  release: {
-    appVersion: "some-app-version",
-    chart: "some-chart",
-    status: "some-status",
-    updated: "some-updated",
-    revision: "some-revision",
-    name: "some-name",
-    namespace: "some-namespace",
-  },
-
-  details: {
-    name: "some-name",
-    namespace: "some-namespace",
-    version: "some-version",
-    config: "some-config",
-    manifest: "some-manifest",
-
-    info: {
-      deleted: "some-deleted",
-      description: "some-description",
-      first_deployed: "some-first-deployed",
-      last_deployed: "some-last-deployed",
-      notes: "some-notes",
-      status: "some-status",
-    },
-
-    resources: [
-      {
-        kind: "some-kind",
-        apiVersion: "some-api-version",
-        metadata: {
-          uid: "some-uid",
-          name: "some-resource",
-          namespace: "some-namespace",
-          creationTimestamp: "2015-10-22T07:28:00Z",
-        },
-      },
-    ],
-  },
-};
diff --git a/src/features/navigation/reload-page/common/channel.ts b/src/features/navigation/reload-page/common/channel.ts
new file mode 100644
index 0000000000..b920067a4d
--- /dev/null
+++ b/src/features/navigation/reload-page/common/channel.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { MessageChannel } from "../../../../common/utils/channel/message-channel-listener-injection-token";
+
+export type ReloadPageChannel = MessageChannel<void>;
+
+export const reloadPageChannel: ReloadPageChannel = {
+  id: "reload-page-channel",
+};
diff --git a/src/features/navigation/reload-page/renderer/register-listener.global-override-for-injectable.ts b/src/features/navigation/reload-page/renderer/register-listener.global-override-for-injectable.ts
new file mode 100644
index 0000000000..c0a43713b7
--- /dev/null
+++ b/src/features/navigation/reload-page/renderer/register-listener.global-override-for-injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../../../../common/test-utils/get-global-override";
+import { reloadPageChannel } from "../common/channel";
+import reloadPageChannelListenerInjectable from "./register-listener.injectable";
+
+export default getGlobalOverride(reloadPageChannelListenerInjectable, () => ({
+  channel: reloadPageChannel,
+  handler: () => {},
+}));
diff --git a/src/features/navigation/reload-page/renderer/register-listener.injectable.ts b/src/features/navigation/reload-page/renderer/register-listener.injectable.ts
new file mode 100644
index 0000000000..a42d818729
--- /dev/null
+++ b/src/features/navigation/reload-page/renderer/register-listener.injectable.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getMessageChannelListenerInjectable } from "../../../../common/utils/channel/message-channel-listener-injection-token";
+import { reloadPageChannel } from "../common/channel";
+
+const reloadPageChannelListenerInjectable = getMessageChannelListenerInjectable({
+  id: "handler",
+  channel: reloadPageChannel,
+  handler: () => () => location.reload(),
+  causesSideEffects: true,
+});
+
+export default reloadPageChannelListenerInjectable;
diff --git a/src/features/pod-logs/__snapshots__/download-logs.test.tsx.snap b/src/features/pod-logs/__snapshots__/download-logs.test.tsx.snap
index 7fda6db615..442d92dbe9 100644
--- a/src/features/pod-logs/__snapshots__/download-logs.test.tsx.snap
+++ b/src/features/pod-logs/__snapshots__/download-logs.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`download logs options in pod logs dock tab when opening pod logs renders 1`] = `
+exports[`download logs options in logs dock tab opening pod logs when logs available renders 1`] = `
 <body>
   <div>
     <div
@@ -430,6 +430,7 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
                       >
                         <i
                           class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-log-tab-some-irrelevant-random-id"
                           tabindex="0"
                         >
                           <span
@@ -439,7 +440,862 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
                             close
                           </span>
                         </i>
-                        <div>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-log-tab-some-irrelevant-random-id"
+                        >
+                          Close ⌘+W
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="toolbar flex gaps align-center box grow"
+            >
+              <div
+                class="dock-menu box grow"
+              >
+                <i
+                  class="Icon new-dock-tab material interactive focusable"
+                  id="menu-actions-for-dock"
+                  tabindex="0"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="add"
+                  >
+                    add
+                  </span>
+                </i>
+                <div>
+                  New tab
+                </div>
+              </div>
+              <i
+                class="Icon material interactive focusable"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="fullscreen"
+                >
+                  fullscreen
+                </span>
+              </i>
+              <div>
+                Fit to window
+              </div>
+              <i
+                class="Icon material interactive focusable"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+              <div>
+                Minimize
+              </div>
+            </div>
+          </div>
+          <div
+            class="tab-content pod-logs"
+            data-testid="dock-tab-content-for-log-tab-some-irrelevant-random-id"
+            style="flex-basis: 300px;"
+          >
+            <div
+              class="PodLogs flex column"
+            >
+              <div
+                class="InfoPanel flex gaps align-center"
+              >
+                <div
+                  class="controls"
+                >
+                  <div
+                    class="flex gaps"
+                  >
+                    <div
+                      class="LogResourceSelector flex gaps align-center"
+                    >
+                      <span>
+                        Namespace
+                      </span>
+                       
+                      <div
+                        class="badge"
+                        data-testid="namespace-badge"
+                      >
+                        default
+                      </div>
+                      <span>
+                        Pod
+                      </span>
+                      <div
+                        class="Select theme-dark pod-selector css-b62m3t-container"
+                      >
+                        <span
+                          class="css-1f43avz-a11yText-A11yText"
+                          id="react-select-4-live-region"
+                        />
+                        <span
+                          aria-atomic="false"
+                          aria-live="polite"
+                          aria-relevant="additions text"
+                          class="css-1f43avz-a11yText-A11yText"
+                        />
+                        <div
+                          class="Select__control css-1s2u09g-control"
+                        >
+                          <div
+                            class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                          >
+                            <div
+                              class="Select__single-value css-qc6sy-singleValue"
+                            >
+                              dockerExporter
+                            </div>
+                            <div
+                              class="Select__input-container css-6j8wv5-Input"
+                              data-value=""
+                            >
+                              <input
+                                aria-autocomplete="list"
+                                aria-expanded="false"
+                                aria-haspopup="true"
+                                autocapitalize="none"
+                                autocomplete="off"
+                                autocorrect="off"
+                                class="Select__input"
+                                id="react-select-4-input"
+                                role="combobox"
+                                spellcheck="false"
+                                style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                tabindex="0"
+                                type="text"
+                                value=""
+                              />
+                            </div>
+                          </div>
+                          <div
+                            class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                          >
+                            <span
+                              class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            />
+                            <div
+                              aria-hidden="true"
+                              class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                            >
+                              <svg
+                                aria-hidden="true"
+                                class="css-tj5bde-Svg"
+                                focusable="false"
+                                height="20"
+                                viewBox="0 0 20 20"
+                                width="20"
+                              >
+                                <path
+                                  d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                />
+                              </svg>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <span>
+                        Container
+                      </span>
+                      <div
+                        class="Select theme-dark container-selector css-b62m3t-container"
+                      >
+                        <span
+                          class="css-1f43avz-a11yText-A11yText"
+                          id="react-select-container-selector-input-live-region"
+                        />
+                        <span
+                          aria-atomic="false"
+                          aria-live="polite"
+                          aria-relevant="additions text"
+                          class="css-1f43avz-a11yText-A11yText"
+                        />
+                        <div
+                          class="Select__control css-1s2u09g-control"
+                        >
+                          <div
+                            class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                          >
+                            <div
+                              class="Select__single-value css-qc6sy-singleValue"
+                            >
+                              docker-exporter
+                            </div>
+                            <div
+                              class="Select__input-container css-6j8wv5-Input"
+                              data-value=""
+                            >
+                              <input
+                                aria-autocomplete="list"
+                                aria-expanded="false"
+                                aria-haspopup="true"
+                                autocapitalize="none"
+                                autocomplete="off"
+                                autocorrect="off"
+                                class="Select__input"
+                                id="container-selector-input"
+                                role="combobox"
+                                spellcheck="false"
+                                style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                tabindex="0"
+                                type="text"
+                                value=""
+                              />
+                            </div>
+                          </div>
+                          <div
+                            class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                          >
+                            <span
+                              class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            />
+                            <div
+                              aria-hidden="true"
+                              class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                            >
+                              <svg
+                                aria-hidden="true"
+                                class="css-tj5bde-Svg"
+                                focusable="false"
+                                height="20"
+                                viewBox="0 0 20 20"
+                                width="20"
+                              >
+                                <path
+                                  d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                />
+                              </svg>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="LogSearch flex box grow justify-flex-end gaps align-center"
+                    >
+                      <div
+                        class="Input SearchInput focused"
+                      >
+                        <label
+                          class="input-area flex gaps align-center"
+                          id=""
+                        >
+                          <input
+                            class="input box grow"
+                            placeholder="Search..."
+                            spellcheck="false"
+                            value=""
+                          />
+                          <i
+                            class="Icon material focusable small"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="search"
+                            >
+                              search
+                            </span>
+                          </i>
+                        </label>
+                        <div
+                          class="input-info flex gaps"
+                        />
+                      </div>
+                      <i
+                        class="Icon material interactive disabled focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="keyboard_arrow_up"
+                        >
+                          keyboard_arrow_up
+                        </span>
+                      </i>
+                      <div>
+                        Previous
+                      </div>
+                      <i
+                        class="Icon material interactive disabled focusable"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="keyboard_arrow_down"
+                        >
+                          keyboard_arrow_down
+                        </span>
+                      </i>
+                      <div>
+                        Next
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="LogList flex"
+              >
+                <div
+                  class="VirtualList box grow"
+                >
+                  <div>
+                    <div
+                      class="list"
+                      style="position: relative; height: 420000px; width: 100%; overflow: auto; will-change: transform; direction: ltr;"
+                    >
+                      <div
+                        style="height: 18px; width: 100%;"
+                      >
+                        <div
+                          class="LogRow"
+                          style="position: absolute; left: 0px; top: 0px; height: 18px; width: 100%;"
+                        >
+                          <span>
+                            some-logs
+                          </span>
+                          <br />
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="controls"
+                data-testid="log-controls"
+              >
+                <div>
+                  <span>
+                    Logs from
+                     
+                    <b>
+                      Invalid Date
+                    </b>
+                  </span>
+                </div>
+                <div
+                  class="flex gaps align-center"
+                >
+                  <label
+                    class="Checkbox flex align-center show-timestamps"
+                  >
+                    <input
+                      type="checkbox"
+                    />
+                    <i
+                      class="box flex align-center"
+                    />
+                    <span
+                      class="label"
+                    >
+                      Show timestamps
+                    </span>
+                  </label>
+                  <label
+                    class="Checkbox flex align-center show-previous checked"
+                  >
+                    <input
+                      checked=""
+                      type="checkbox"
+                    />
+                    <i
+                      class="box flex align-center"
+                    />
+                    <span
+                      class="label"
+                    >
+                      Show previous terminated container
+                    </span>
+                  </label>
+                  <div>
+                    <div
+                      id="download-logs-dropdown"
+                    >
+                      <button
+                        class="dropdown"
+                        data-testid="download-logs-dropdown"
+                      >
+                        Download
+                        <i
+                          class="Icon material focusable smallest"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="arrow_drop_down"
+                          >
+                            arrow_drop_down
+                          </span>
+                        </i>
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</body>
+`;
+
+exports[`download logs options in logs dock tab opening pod logs when logs not available renders 1`] = `
+<body>
+  <div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+    <div
+      class="mainLayout"
+      style="--sidebar-width: 200px;"
+    >
+      <div
+        class="sidebar"
+      >
+        <div
+          class="flex flex-col"
+          data-testid="cluster-sidebar"
+        >
+          <div
+            class="SidebarCluster"
+          >
+            <div
+              class="Avatar rounded loadingAvatar"
+              style="width: 40px; height: 40px;"
+            >
+              ??
+            </div>
+            <div
+              class="loadingClusterName"
+            />
+          </div>
+          <div
+            class="sidebarNav sidebar-active-status"
+          >
+            <div
+              class="SidebarItem"
+              data-is-active-test="true"
+              data-testid="sidebar-item-workloads"
+            >
+              <a
+                aria-current="page"
+                class="navItem active"
+                data-testid="sidebar-item-link-for-workloads"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Workloads
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-config"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-config"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="list"
+                  >
+                    list
+                  </span>
+                </i>
+                <span>
+                  Config
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-network"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-network"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="device_hub"
+                  >
+                    device_hub
+                  </span>
+                </i>
+                <span>
+                  Network
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-storage"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-storage"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="storage"
+                  >
+                    storage
+                  </span>
+                </i>
+                <span>
+                  Storage
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-helm"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-helm"
+                href="/"
+              >
+                <i
+                  class="Icon svg focusable"
+                >
+                  <span
+                    class="icon"
+                  />
+                </i>
+                <span>
+                  Helm
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-user-management"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-user-management"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="security"
+                  >
+                    security
+                  </span>
+                </i>
+                <span>
+                  Access Control
+                </span>
+              </a>
+            </div>
+            <div
+              class="SidebarItem"
+              data-is-active-test="false"
+              data-testid="sidebar-item-custom-resources"
+            >
+              <a
+                class="navItem"
+                data-testid="sidebar-item-link-for-custom-resources"
+                href="/"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="extension"
+                  >
+                    extension
+                  </span>
+                </i>
+                <span>
+                  Custom Resources
+                </span>
+                <i
+                  class="Icon expandIcon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="keyboard_arrow_down"
+                  >
+                    keyboard_arrow_down
+                  </span>
+                </i>
+              </a>
+            </div>
+          </div>
+        </div>
+        <div
+          class="ResizingAnchor horizontal trailing"
+        />
+      </div>
+      <div
+        class="contents"
+      >
+        <div
+          class="TabLayout"
+          data-testid="tab-layout"
+        >
+          <div
+            class="Tabs center scrollable"
+          >
+            <div
+              class="Tab flex gaps align-center active"
+              data-is-active-test="true"
+              data-testid="tab-link-for-overview"
+              role="tab"
+              tabindex="0"
+            >
+              <div
+                class="label"
+              >
+                Overview
+              </div>
+            </div>
+          </div>
+          <main>
+            <div
+              class="WorkloadsOverview flex column gaps"
+              data-testid="page-for-workloads-overview"
+            >
+              <div
+                class="header flex gaps align-center"
+              >
+                <h5
+                  class="box grow"
+                >
+                  Overview
+                </h5>
+                <div
+                  class="NamespaceSelectFilterParent"
+                  data-testid="namespace-select-filter"
+                >
+                  <div
+                    class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-overview-namespace-select-filter-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-overview-namespace-select-filter-input-placeholder"
+                        >
+                          All namespaces
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="overview-namespace-select-filter-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="OverviewStatuses"
+              >
+                <div
+                  class="workloads"
+                />
+              </div>
+            </div>
+          </main>
+        </div>
+      </div>
+      <div
+        class="footer"
+      >
+        <div
+          class="Dock isOpen"
+          tabindex="-1"
+        >
+          <div
+            class="ResizingAnchor vertical leading"
+          />
+          <div
+            class="tabs-container flex align-center"
+          >
+            <div
+              class="dockTabs"
+              role="tablist"
+            >
+              <div
+                class="Tabs tabs"
+              >
+                <div
+                  class="Tab flex gaps align-center DockTab active"
+                  data-testid="dock-tab-for-log-tab-some-irrelevant-random-id"
+                  id="tab-log-tab-some-irrelevant-random-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <i
+                    class="Icon material focusable small"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="subject"
+                    >
+                      subject
+                    </span>
+                  </i>
+                  <div
+                    class="label"
+                  >
+                    <div
+                      class="flex align-center"
+                    >
+                      <span
+                        class="title"
+                      >
+                        Pod dockerExporter
+                      </span>
+                      <div
+                        class="close"
+                      >
+                        <i
+                          class="Icon material interactive focusable small"
+                          data-testid="dock-tab-close-for-log-tab-some-irrelevant-random-id"
+                          tabindex="0"
+                        >
+                          <span
+                            class="icon"
+                            data-icon-name="close"
+                          >
+                            close
+                          </span>
+                        </i>
+                        <div
+                          data-testid="tooltip-content-for-dock-tab-close-for-log-tab-some-irrelevant-random-id"
+                        >
                           Close ⌘+W
                         </div>
                       </div>
@@ -743,46 +1599,17 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
                 </div>
               </div>
               <div
-                class="LogList flex"
+                class="LogList flex box grow align-center justify-center"
               >
-                <div
-                  class="VirtualList box grow"
-                >
-                  <div>
-                    <div
-                      class="list"
-                      style="position: relative; height: 420000px; width: 100%; overflow: auto; will-change: transform; direction: ltr;"
-                    >
-                      <div
-                        style="height: 18px; width: 100%;"
-                      >
-                        <div
-                          class="LogRow"
-                          style="position: absolute; left: 0px; top: 0px; height: 18px; width: 100%;"
-                        >
-                          <span>
-                            some-logs
-                          </span>
-                          <br />
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
+                There are no logs available for container
+                 
+                docker-exporter
               </div>
               <div
                 class="controls"
                 data-testid="log-controls"
               >
-                <div>
-                  <span>
-                    Logs from
-                     
-                    <b>
-                      Invalid Date
-                    </b>
-                  </span>
-                </div>
+                <div />
                 <div
                   class="flex gaps align-center"
                 >
@@ -824,6 +1651,7 @@ exports[`download logs options in pod logs dock tab when opening pod logs render
                       <button
                         class="dropdown"
                         data-testid="download-logs-dropdown"
+                        disabled=""
                       >
                         Download
                         <i
diff --git a/src/features/pod-logs/download-logs.test.tsx b/src/features/pod-logs/download-logs.test.tsx
index 451f0163a0..30d2d72128 100644
--- a/src/features/pod-logs/download-logs.test.tsx
+++ b/src/features/pod-logs/download-logs.test.tsx
@@ -25,14 +25,26 @@ import reloadLogsInjectable from "../../renderer/components/dock/logs/reload-log
 import setLogTabDataInjectable from "../../renderer/components/dock/logs/set-log-tab-data.injectable";
 import stopLoadingLogsInjectable from "../../renderer/components/dock/logs/stop-loading-logs.injectable";
 import { dockerPod } from "../../renderer/components/dock/logs/__test__/pod.mock";
+import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable";
+import type { DiContainer } from "@ogre-tools/injectable";
 import type { Container } from "../../common/k8s-api/endpoints";
 
-describe("download logs options in pod logs dock tab", () => {
+describe("download logs options in logs dock tab", () => {
+  let windowDi: DiContainer;
   let rendered: RenderResult;
   let builder: ApplicationBuilder;
   let openSaveFileDialogMock: jest.MockedFunction<() => void>;
   let callForLogsMock: jest.MockedFunction<CallForLogs>;
+  let getLogsMock: jest.Mock;
+  let getSplittedLogsMock: jest.Mock;
+  let showErrorNotificationMock: jest.Mock;
   const logs = new Map([["timestamp", "some-logs"]]);
+  const pod = dockerPod;
+
+  const container: Container = {
+    name: "docker-exporter",
+    image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
+  };
 
   beforeEach(() => {
     const selectedPod = dockerPod;
@@ -42,14 +54,16 @@ describe("download logs options in pod logs dock tab", () => {
     builder.setEnvironmentToClusterFrame();
 
     callForLogsMock = jest.fn();
+    getLogsMock = jest.fn();
+    getSplittedLogsMock = jest.fn();
 
     builder.beforeWindowStart((windowDi) => {
       windowDi.override(callForLogsInjectable, () => callForLogsMock);
 
       // Overriding internals of logsViewModelInjectable
-      windowDi.override(getLogsInjectable, () => () => ["some-logs"]);
-      windowDi.override(getLogsWithoutTimestampsInjectable, () => () => ["some-logs"]);
-      windowDi.override(getTimestampSplitLogsInjectable, () => () => [...logs]);
+      windowDi.override(getLogsInjectable, () => getLogsMock);
+      windowDi.override(getLogsWithoutTimestampsInjectable, () => getLogsMock);
+      windowDi.override(getTimestampSplitLogsInjectable, () => getSplittedLogsMock);
       windowDi.override(reloadLogsInjectable, () => jest.fn());
       windowDi.override(getLogTabDataInjectable, () => () => ({
         selectedPodId: selectedPod.getId(),
@@ -76,58 +90,76 @@ describe("download logs options in pod logs dock tab", () => {
 
       openSaveFileDialogMock = jest.fn();
       windowDi.override(openSaveFileDialogInjectable, () => openSaveFileDialogMock);
+
+      showErrorNotificationMock = jest.fn();
+      windowDi.override(showErrorNotificationInjectable, () => showErrorNotificationMock);
     });
   });
 
-  describe("when opening pod logs", () => {
+  describe("opening pod logs", () => {
     beforeEach(async () => {
       rendered = await builder.render();
-
-      const windowDi = builder.applicationWindow.only.di;
-      const pod = dockerPod;
-      const createLogsTab = windowDi.inject(createPodLogsTabInjectable);
-      const container: Container = {
-        name: "docker-exporter",
-        image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
-        imagePullPolicy: "Always",
-      };
-
+      windowDi = builder.applicationWindow.only.di;
+  
       const dockStore = windowDi.inject(dockStoreInjectable);
 
       dockStore.closeTab("terminal");
+    });
 
-      createLogsTab({
-        selectedPod: pod,
-        selectedContainer: container,
+    describe("when logs not available", () => {
+      beforeEach(async () => {
+        const createLogsTab = windowDi.inject(createPodLogsTabInjectable);
+    
+        getLogsMock.mockReturnValue([]);
+        getSplittedLogsMock.mockReturnValue([]);
+  
+        createLogsTab({
+          selectedPod: pod,
+          selectedContainer: container,
+        });
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("dropdown being disabled", () => {
+        const downloadButton = rendered.getByTestId("download-logs-dropdown");
+
+        expect(downloadButton).toBeDisabled();
       });
     });
 
-    it("renders", () => {
-      expect(rendered.baseElement).toMatchSnapshot();
-    });
-
-    it("contains download dropdown button", () =>  {
-      expect(rendered.getByTestId("download-logs-dropdown")).toBeInTheDocument();
-    });
-
-    describe("when clicking on button", () => {
-      beforeEach(() => {
-        const button = rendered.getByTestId("download-logs-dropdown");
-
-        act(() => button.click());
+    describe("when logs available", () => {
+      beforeEach(async () => {
+        const createLogsTab = windowDi.inject(createPodLogsTabInjectable);
+    
+        getLogsMock.mockReturnValue(["some-logs"]);
+        getSplittedLogsMock.mockReturnValue([...logs]);
+  
+        createLogsTab({
+          selectedPod: pod,
+          selectedContainer: container,
+        });
       });
 
-      it("shows download visible logs menu item", () => {
-        expect(rendered.getByTestId("download-visible-logs")).toBeInTheDocument();
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
       });
 
-      it("shows download all logs menu item", () => {
-        expect(rendered.getByTestId("download-all-logs")).toBeInTheDocument();
+      it("contains download dropdown button", () =>  {
+        expect(rendered.getByTestId("download-logs-dropdown")).toBeInTheDocument();
       });
 
-      describe("when call for logs resolves with logs", () => {
+      it("dropdown is enabled", () => {
+        expect(rendered.getByTestId("download-logs-dropdown")).not.toHaveAttribute("disabled");
+      });
+
+      describe("when clicking on dropdown", () => {
         beforeEach(() => {
-          callForLogsMock.mockResolvedValue("all-logs");
+          const button = rendered.getByTestId("download-logs-dropdown");
+  
+          act(() => button.click());
         });
 
         describe("when selected 'download visible logs'", () => {
@@ -142,122 +174,106 @@ describe("download logs options in pod logs dock tab", () => {
           });
         });
 
-        describe("when selected 'download all logs'", () => {
+        describe("when call for all logs resolves with logs", () => {
           beforeEach(async () => {
-            await act(async () => {
-              const button = rendered.getByTestId("download-all-logs");
+            callForLogsMock.mockResolvedValue("all-logs");
+          });
 
-              button.click();
+          describe("when selected 'download all logs'", () => {
+            beforeEach(async () => {
+              await act(async () => {
+                const button = rendered.getByTestId("download-all-logs");
+  
+                button.click();
+              });
+            });
+
+            it("logs have been called with query", () => {
+              expect(callForLogsMock).toHaveBeenCalledWith(
+                { name: "dockerExporter", namespace: "default" },
+                { "previous": true, "timestamps": false },
+              );
+            });
+  
+            it("shows save dialog with proper attributes", async () => {
+              expect(openSaveFileDialogMock).toHaveBeenCalledWith("dockerExporter.log", "all-logs", "text/plain");
+            });
+  
+            it("doesn't block download dropdown for interaction after click", async () => {
+              expect(rendered.getByTestId("download-logs-dropdown")).not.toHaveAttribute("disabled");
             });
           });
 
-          it("logs have been called with query", () => {
-            expect(callForLogsMock).toHaveBeenCalledWith(
-              { name: "dockerExporter", namespace: "default" },
-              { "previous": true, "timestamps": false },
-            );
-          });
-
-          it("shows save dialog with proper attributes", async () => {
-            expect(openSaveFileDialogMock).toHaveBeenCalledWith("dockerExporter.log", "all-logs", "text/plain");
-          });
-
-          it("doesn't block download dropdown for interaction after click", async () => {
-            expect(rendered.getByTestId("download-logs-dropdown")).not.toHaveAttribute("disabled");
-          });
-        });
-
-        describe("blocking user interaction after menu item click", () => {
-          it("block download dropdown for interaction when selected 'download all logs'", async () => {
-            const downloadMenuItem = rendered.getByTestId("download-all-logs");
-
-            act(() => downloadMenuItem.click());
-
-            await waitFor(() => {
-              expect(rendered.getByTestId("download-logs-dropdown")).toHaveAttribute("disabled");
+          describe("blocking user interaction after menu item click", () => {
+            it("block download dropdown for interaction when selected 'download all logs'", async () => {
+              const downloadMenuItem = rendered.getByTestId("download-all-logs");
+  
+              act(() => downloadMenuItem.click());
+  
+              await waitFor(() => {
+                expect(rendered.getByTestId("download-logs-dropdown")).toHaveAttribute("disabled");
+              });
+            });
+  
+            it("doesn't block dropdown for interaction when selected 'download visible logs'", () => {
+              const downloadMenuItem = rendered.getByTestId("download-visible-logs");
+  
+              act(() => downloadMenuItem.click());
+  
+              expect(rendered.getByTestId("download-logs-dropdown")).not.toHaveAttribute("disabled");
             });
           });
+        });
 
-          it("doesn't block dropdown for interaction when selected 'download visible logs'", () => {
-            const downloadMenuItem = rendered.getByTestId("download-visible-logs");
+        describe("when call for logs resolves with no logs", () => {
+          beforeEach(async () => {
+            callForLogsMock.mockResolvedValue("");
+          });
 
-            act(() => downloadMenuItem.click());
+          describe("when selected 'download all logs'", () => {
+            beforeEach(async () => {
+              await act(async () => {
+                const button = rendered.getByTestId("download-all-logs");
+  
+                button.click();
+              });
+            });
 
-            expect(rendered.getByTestId("download-logs-dropdown")).not.toHaveAttribute("disabled");
+            it("doesn't show save dialog", () => {
+              expect(openSaveFileDialogMock).not.toHaveBeenCalled();
+            });
+  
+            it("shows error notification", () => {
+              expect(showErrorNotificationMock).toHaveBeenCalled();
+            });
           });
         });
-      });
 
-      describe("when call for logs resolves with no logs", () => {
-        beforeEach(() => {
-          callForLogsMock.mockResolvedValue("");
-        });
-
-        describe("when selected 'download visible logs'", () => {
+        describe("when call for logs rejects", () => {
           beforeEach(() => {
-            const button = rendered.getByTestId("download-visible-logs");
-
-            button.click();
+            callForLogsMock.mockRejectedValue("error");
           });
-
-          it("shows save dialog with proper attributes", () => {
-            expect(openSaveFileDialogMock).toHaveBeenCalledWith("dockerExporter.log", "some-logs", "text/plain");
-          });
-        });
-
-        describe("when selected 'download all logs'", () => {
-          beforeEach(async () => {
-            await act(async () => {
-              const button = rendered.getByTestId("download-all-logs");
-
-              button.click();
+  
+          describe("when selected 'download all logs'", () => {
+            beforeEach(async () => {
+              await act(async () => {
+                const button = rendered.getByTestId("download-all-logs");
+  
+                button.click();
+              });
             });
-          });
-
-          it("doesn't show save dialog", async () => {
-            expect(openSaveFileDialogMock).not.toHaveBeenCalled();
-          });
-        });
-      });
-
-      describe("when call for logs rejects", () => {
-        beforeEach(() => {
-          callForLogsMock.mockRejectedValue("error");
-        });
-
-        describe("when selected 'download visible logs'", () => {
-          beforeEach(async () => {
-            await act(async () => {
-              const button = rendered.getByTestId("download-visible-logs");
-
-              button.click();
+  
+            it("logs have been called", () => {
+              expect(callForLogsMock).toHaveBeenCalledWith(
+                { name: "dockerExporter", namespace: "default" },
+                { "previous": true, "timestamps": false },
+              );
             });
-          });
-
-          it("shows save dialog with proper attributes", () => {
-            expect(openSaveFileDialogMock).toHaveBeenCalledWith("dockerExporter.log", "some-logs", "text/plain");
-          });
-        });
-
-        describe("when selected 'download all logs'", () => {
-          beforeEach(async () => {
-            await act(async () => {
-              const button = rendered.getByTestId("download-all-logs");
-
-              button.click();
+  
+            it("doesn't show save dialog", async () => {
+              expect(openSaveFileDialogMock).not.toHaveBeenCalled();
             });
           });
-
-          it("logs have been called", () => {
-            expect(callForLogsMock).toHaveBeenCalledWith(
-              { name: "dockerExporter", namespace: "default" },
-              { "previous": true, "timestamps": false },
-            );
-          });
-
-          it("doesn't show save dialog", async () => {
-            expect(openSaveFileDialogMock).not.toHaveBeenCalled();
-          });
         });
       });
     });
diff --git a/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
index a6619bfd26..f87feb798c 100644
--- a/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
@@ -11,44 +11,62 @@ exports[`preferences - closing-preferences given accessing preferences directly
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -56,7 +74,6 @@ exports[`preferences - closing-preferences given accessing preferences directly
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -68,80 +85,84 @@ exports[`preferences - closing-preferences given accessing preferences directly
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-some-test-preference-navigation-item-id"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Some preference navigation item
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Test tab
+                  </div>
                 </div>
               </div>
             </div>
@@ -155,400 +176,429 @@ exports[`preferences - closing-preferences given accessing preferences directly
             class="content"
           >
             <section
-              id="application"
+              data-preference-page-test="application-page"
+              id="application-page"
             >
               <h2
-                data-testid="application-header"
+                data-preference-page-title-test="true"
               >
                 Application
               </h2>
-              <section
-                id="appearance"
+              <div
+                data-preference-item-test="theme"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="appearance"
                 >
-                  Theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-theme-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="extensionRegistryUrl"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="extensionRegistryUrl"
                 >
-                  Extension Install Registry
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-extension-install-registry-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-extension-install-registry-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-extension-install-registry-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="extension-install-registry-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <p
-                  class="mt-4 mb-5 leading-relaxed"
-                >
-                  This setting is to change the registry URL for installing extensions by name. 
-                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                  <b>
-                    .npmrc
-                  </b>
-                   file or in the input below.
-                </p>
-                <div
-                  class="Input theme round black disabled invalid"
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
                 >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
                   <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="Switch"
+                    data-testid="switch"
                   >
+                    Automatically start Lens on login
                     <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="Custom Extension Registry URL..."
-                      spellcheck="false"
-                      value="some-custom-url"
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <hr />
-              <section
-                id="other"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="update-channel"
                 >
-                  Start-up
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Automatically start Lens on login
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <hr />
-              <section
-                id="update-channel"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Update Channel
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-update-channel-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__single-value css-qc6sy-singleValue"
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                       >
-                        Stable
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="update-channel-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="locale"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="locale"
                 >
-                  Locale Timezone
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-timezone-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-timezone-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-timezone-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="timezone-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -633,6 +683,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -661,44 +712,62 @@ exports[`preferences - closing-preferences given accessing preferences directly
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -717,80 +786,84 @@ exports[`preferences - closing-preferences given accessing preferences directly
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-some-test-preference-navigation-item-id"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Some preference navigation item
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Test tab
+                  </div>
                 </div>
               </div>
             </div>
@@ -803,7 +876,13 @@ exports[`preferences - closing-preferences given accessing preferences directly
           <div
             class="content"
           >
-            Some test page
+            <div
+              data-preference-item-test="test-item"
+            >
+              <div>
+                irrelevant
+              </div>
+            </div>
           </div>
           <div
             class="toolsRegion"
@@ -887,6 +966,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -915,50 +995,70 @@ exports[`preferences - closing-preferences given accessing preferences directly
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
         id="lens-views"
       />
-      <div>
+      <div
+        data-testid="some-front-page"
+      >
         Some front page
       </div>
     </main>
@@ -1007,6 +1107,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1035,50 +1136,70 @@ exports[`preferences - closing-preferences given accessing preferences directly
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
         id="lens-views"
       />
-      <div>
+      <div
+        data-testid="some-front-page"
+      >
         Some front page
       </div>
     </main>
@@ -1127,6 +1248,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1155,44 +1277,62 @@ exports[`preferences - closing-preferences given already in a page and then navi
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -1200,7 +1340,6 @@ exports[`preferences - closing-preferences given already in a page and then navi
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -1212,80 +1351,84 @@ exports[`preferences - closing-preferences given already in a page and then navi
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-some-test-preference-navigation-item-id"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Some preference navigation item
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Test tab
+                  </div>
                 </div>
               </div>
             </div>
@@ -1299,400 +1442,429 @@ exports[`preferences - closing-preferences given already in a page and then navi
             class="content"
           >
             <section
-              id="application"
+              data-preference-page-test="application-page"
+              id="application-page"
             >
               <h2
-                data-testid="application-header"
+                data-preference-page-title-test="true"
               >
                 Application
               </h2>
-              <section
-                id="appearance"
+              <div
+                data-preference-item-test="theme"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="appearance"
                 >
-                  Theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-theme-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="extensionRegistryUrl"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="extensionRegistryUrl"
                 >
-                  Extension Install Registry
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-extension-install-registry-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-extension-install-registry-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-extension-install-registry-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="extension-install-registry-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <p
-                  class="mt-4 mb-5 leading-relaxed"
-                >
-                  This setting is to change the registry URL for installing extensions by name. 
-                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                  <b>
-                    .npmrc
-                  </b>
-                   file or in the input below.
-                </p>
-                <div
-                  class="Input theme round black disabled invalid"
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
                 >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
                   <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="Switch"
+                    data-testid="switch"
                   >
+                    Automatically start Lens on login
                     <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="Custom Extension Registry URL..."
-                      spellcheck="false"
-                      value="some-custom-url"
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <hr />
-              <section
-                id="other"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="update-channel"
                 >
-                  Start-up
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Automatically start Lens on login
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <hr />
-              <section
-                id="update-channel"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Update Channel
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-update-channel-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__single-value css-qc6sy-singleValue"
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                       >
-                        Stable
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="update-channel-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="locale"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="locale"
                 >
-                  Locale Timezone
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-timezone-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-timezone-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-timezone-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="timezone-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -1777,6 +1949,7 @@ exports[`preferences - closing-preferences given already in a page and then navi
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1805,44 +1978,62 @@ exports[`preferences - closing-preferences given already in a page and then navi
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -1861,80 +2052,84 @@ exports[`preferences - closing-preferences given already in a page and then navi
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-some-test-preference-navigation-item-id"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Some preference navigation item
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Test tab
+                  </div>
                 </div>
               </div>
             </div>
@@ -1947,7 +2142,13 @@ exports[`preferences - closing-preferences given already in a page and then navi
           <div
             class="content"
           >
-            Some test page
+            <div
+              data-preference-item-test="test-item"
+            >
+              <div>
+                irrelevant
+              </div>
+            </div>
           </div>
           <div
             class="toolsRegion"
@@ -2031,6 +2232,7 @@ exports[`preferences - closing-preferences given already in a page and then navi
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -2059,185 +2261,71 @@ exports[`preferences - closing-preferences given already in a page and then navi
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
         id="lens-views"
       />
       <div
-        class="SettingLayout showNavigation Preferences"
+        data-testid="some-page"
       >
-        <nav
-          class="sidebarRegion"
-        >
-          <div
-            class="sidebar"
-          >
-            <div
-              class="Tabs flex column"
-            >
-              <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  App
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Proxy
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-some-test-preference-navigation-item-id"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Some preference navigation item
-                </div>
-              </div>
-            </div>
-          </div>
-        </nav>
-        <div
-          class="contentRegion"
-          id="ScrollSpyRoot"
-        >
-          <div
-            class="content"
-          >
-            Some test page
-          </div>
-          <div
-            class="toolsRegion"
-          >
-            <div
-              class="fixed top-[60px]"
-            >
-              <div
-                data-testid="close-preferences"
-              >
-                <div
-                  aria-label="Close"
-                  class="closeButton"
-                  role="button"
-                >
-                  <i
-                    class="Icon icon material focusable"
-                  >
-                    <span
-                      class="icon"
-                      data-icon-name="close"
-                    >
-                      close
-                    </span>
-                  </i>
-                </div>
-                <div
-                  aria-hidden="true"
-                  class="esc"
-                >
-                  ESC
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
+        Some content
       </div>
     </main>
     <div
@@ -2285,6 +2373,7 @@ exports[`preferences - closing-preferences given already in a page and then navi
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -2313,185 +2402,71 @@ exports[`preferences - closing-preferences given already in a page and then navi
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
         id="lens-views"
       />
       <div
-        class="SettingLayout showNavigation Preferences"
+        data-testid="some-page"
       >
-        <nav
-          class="sidebarRegion"
-        >
-          <div
-            class="sidebar"
-          >
-            <div
-              class="Tabs flex column"
-            >
-              <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  App
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Proxy
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-some-test-preference-navigation-item-id"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Some preference navigation item
-                </div>
-              </div>
-            </div>
-          </div>
-        </nav>
-        <div
-          class="contentRegion"
-          id="ScrollSpyRoot"
-        >
-          <div
-            class="content"
-          >
-            Some test page
-          </div>
-          <div
-            class="toolsRegion"
-          >
-            <div
-              class="fixed top-[60px]"
-            >
-              <div
-                data-testid="close-preferences"
-              >
-                <div
-                  aria-label="Close"
-                  class="closeButton"
-                  role="button"
-                >
-                  <i
-                    class="Icon icon material focusable"
-                  >
-                    <span
-                      class="icon"
-                      data-icon-name="close"
-                    >
-                      close
-                    </span>
-                  </i>
-                </div>
-                <div
-                  aria-hidden="true"
-                  class="esc"
-                >
-                  ESC
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
+        Some content
       </div>
     </main>
     <div
@@ -2539,6 +2514,7 @@ exports[`preferences - closing-preferences given already in a page and then navi
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap b/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap
index e5713ce61b..bffec4ec93 100644
--- a/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap
@@ -12,44 +12,62 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -57,7 +75,6 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="application-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -69,92 +86,96 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-extension-some-extension-nav-item-some-other-preference-tab-id"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    Some other title
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-extension-some-extension-nav-item-some-preference-tab-id"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="extension-some-extension-some-other-preference-tab-id"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Some title
+                    <div
+                      class="label"
+                    >
+                      Some other title
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="extension-some-extension-some-preference-tab-id"
+                    role="tab"
+                    tabindex="0"
                   >
-                    App
+                    <div
+                      class="label"
+                    >
+                      Some title
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -168,400 +189,429 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
               class="content"
             >
               <section
-                id="application"
+                data-preference-page-test="application-page"
+                id="application-page"
               >
                 <h2
-                  data-testid="application-header"
+                  data-preference-page-title-test="true"
                 >
                   Application
                 </h2>
-                <section
-                  id="appearance"
+                <div
+                  data-preference-item-test="theme"
                 >
-                  <div
-                    class="SubTitle"
+                  <section
+                    id="appearance"
                   >
-                    Theme
-                     
-                  </div>
-                  <div
-                    class="Select theme-lens css-b62m3t-container"
-                  >
-                    <span
-                      class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-theme-input-live-region"
-                    />
-                    <span
-                      aria-atomic="false"
-                      aria-live="polite"
-                      aria-relevant="additions text"
-                      class="css-1f43avz-a11yText-A11yText"
-                    />
                     <div
-                      class="Select__control css-1s2u09g-control"
+                      class="SubTitle"
                     >
+                      Theme
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-theme-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
                       <div
-                        class="Select__value-container css-319lph-ValueContainer"
+                        class="Select__control css-1s2u09g-control"
                       >
                         <div
-                          class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-theme-input-placeholder"
+                          class="Select__value-container css-319lph-ValueContainer"
                         >
-                          Select...
-                        </div>
-                        <div
-                          class="Select__input-container css-6j8wv5-Input"
-                          data-value=""
-                        >
-                          <input
-                            aria-autocomplete="list"
-                            aria-describedby="react-select-theme-input-placeholder"
-                            aria-expanded="false"
-                            aria-haspopup="true"
-                            autocapitalize="none"
-                            autocomplete="off"
-                            autocorrect="off"
-                            class="Select__input"
-                            id="theme-input"
-                            role="combobox"
-                            spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                            tabindex="0"
-                            type="text"
-                            value=""
-                          />
-                        </div>
-                      </div>
-                      <div
-                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                      >
-                        <span
-                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                        />
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="css-tj5bde-Svg"
-                            focusable="false"
-                            height="20"
-                            viewBox="0 0 20 20"
-                            width="20"
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-theme-input-placeholder"
                           >
-                            <path
-                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-theme-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="theme-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
                             />
-                          </svg>
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="extensionRegistryUrl"
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="extension-install-registry"
                 >
-                  <div
-                    class="SubTitle"
+                  <section
+                    id="extensionRegistryUrl"
                   >
-                    Extension Install Registry
-                     
-                  </div>
-                  <div
-                    class="Select theme-lens css-b62m3t-container"
-                  >
-                    <span
-                      class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-extension-install-registry-input-live-region"
-                    />
-                    <span
-                      aria-atomic="false"
-                      aria-live="polite"
-                      aria-relevant="additions text"
-                      class="css-1f43avz-a11yText-A11yText"
-                    />
                     <div
-                      class="Select__control css-1s2u09g-control"
+                      class="SubTitle"
                     >
+                      Extension Install Registry
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-extension-install-registry-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
                       <div
-                        class="Select__value-container css-319lph-ValueContainer"
+                        class="Select__control css-1s2u09g-control"
                       >
                         <div
-                          class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-extension-install-registry-input-placeholder"
+                          class="Select__value-container css-319lph-ValueContainer"
                         >
-                          Select...
-                        </div>
-                        <div
-                          class="Select__input-container css-6j8wv5-Input"
-                          data-value=""
-                        >
-                          <input
-                            aria-autocomplete="list"
-                            aria-describedby="react-select-extension-install-registry-input-placeholder"
-                            aria-expanded="false"
-                            aria-haspopup="true"
-                            autocapitalize="none"
-                            autocomplete="off"
-                            autocorrect="off"
-                            class="Select__input"
-                            id="extension-install-registry-input"
-                            role="combobox"
-                            spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                            tabindex="0"
-                            type="text"
-                            value=""
-                          />
-                        </div>
-                      </div>
-                      <div
-                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                      >
-                        <span
-                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                        />
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="css-tj5bde-Svg"
-                            focusable="false"
-                            height="20"
-                            viewBox="0 0 20 20"
-                            width="20"
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-extension-install-registry-input-placeholder"
                           >
-                            <path
-                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-extension-install-registry-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="extension-install-registry-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
                             />
-                          </svg>
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                  <p
-                    class="mt-4 mb-5 leading-relaxed"
-                  >
-                    This setting is to change the registry URL for installing extensions by name. 
-                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                    <b>
-                      .npmrc
-                    </b>
-                     file or in the input below.
-                  </p>
-                  <div
-                    class="Input theme round black disabled invalid"
+                    <p
+                      class="mt-4 mb-5 leading-relaxed"
+                    >
+                      This setting is to change the registry URL for installing extensions by name. 
+                      If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                      <b>
+                        .npmrc
+                      </b>
+                       file or in the input below.
+                    </p>
+                    <div
+                      class="Input theme round black disabled invalid"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="Custom Extension Registry URL..."
+                          spellcheck="false"
+                          value="some-custom-url"
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="start-up"
+                >
+                  <section
+                    id="other"
                   >
+                    <div
+                      class="SubTitle"
+                    >
+                      Start-up
+                       
+                    </div>
                     <label
-                      class="input-area flex gaps align-center"
-                      id=""
+                      class="Switch"
+                      data-testid="switch"
                     >
+                      Automatically start Lens on login
                       <input
-                        class="input box grow"
-                        disabled=""
-                        placeholder="Custom Extension Registry URL..."
-                        spellcheck="false"
-                        value="some-custom-url"
+                        role="switch"
+                        type="checkbox"
                       />
                     </label>
-                    <div
-                      class="input-info flex gaps"
-                    />
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="other"
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="update-channel"
                 >
-                  <div
-                    class="SubTitle"
+                  <section
+                    id="update-channel"
                   >
-                    Start-up
-                     
-                  </div>
-                  <label
-                    class="Switch"
-                    data-testid="switch"
-                  >
-                    Automatically start Lens on login
-                    <input
-                      role="switch"
-                      type="checkbox"
-                    />
-                  </label>
-                </section>
-                <hr />
-                <section
-                  id="update-channel"
-                >
-                  <div
-                    class="SubTitle"
-                  >
-                    Update Channel
-                     
-                  </div>
-                  <div
-                    class="Select theme-lens css-b62m3t-container"
-                  >
-                    <span
-                      class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-update-channel-input-live-region"
-                    />
-                    <span
-                      aria-atomic="false"
-                      aria-live="polite"
-                      aria-relevant="additions text"
-                      class="css-1f43avz-a11yText-A11yText"
-                    />
                     <div
-                      class="Select__control css-1s2u09g-control"
+                      class="SubTitle"
                     >
+                      Update Channel
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-update-channel-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
                       <div
-                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                        class="Select__control css-1s2u09g-control"
                       >
                         <div
-                          class="Select__single-value css-qc6sy-singleValue"
+                          class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                         >
-                          Stable
-                        </div>
-                        <div
-                          class="Select__input-container css-6j8wv5-Input"
-                          data-value=""
-                        >
-                          <input
-                            aria-autocomplete="list"
-                            aria-expanded="false"
-                            aria-haspopup="true"
-                            autocapitalize="none"
-                            autocomplete="off"
-                            autocorrect="off"
-                            class="Select__input"
-                            id="update-channel-input"
-                            role="combobox"
-                            spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                            tabindex="0"
-                            type="text"
-                            value=""
-                          />
-                        </div>
-                      </div>
-                      <div
-                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                      >
-                        <span
-                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                        />
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="css-tj5bde-Svg"
-                            focusable="false"
-                            height="20"
-                            viewBox="0 0 20 20"
-                            width="20"
+                          <div
+                            class="Select__single-value css-qc6sy-singleValue"
                           >
-                            <path
-                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            Stable
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="update-channel-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
                             />
-                          </svg>
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="locale"
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="timezone"
                 >
-                  <div
-                    class="SubTitle"
+                  <section
+                    id="locale"
                   >
-                    Locale Timezone
-                     
-                  </div>
-                  <div
-                    class="Select theme-lens css-b62m3t-container"
-                  >
-                    <span
-                      class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-timezone-input-live-region"
-                    />
-                    <span
-                      aria-atomic="false"
-                      aria-live="polite"
-                      aria-relevant="additions text"
-                      class="css-1f43avz-a11yText-A11yText"
-                    />
                     <div
-                      class="Select__control css-1s2u09g-control"
+                      class="SubTitle"
                     >
+                      Locale Timezone
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-timezone-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
                       <div
-                        class="Select__value-container css-319lph-ValueContainer"
+                        class="Select__control css-1s2u09g-control"
                       >
                         <div
-                          class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-timezone-input-placeholder"
+                          class="Select__value-container css-319lph-ValueContainer"
                         >
-                          Select...
-                        </div>
-                        <div
-                          class="Select__input-container css-6j8wv5-Input"
-                          data-value=""
-                        >
-                          <input
-                            aria-autocomplete="list"
-                            aria-describedby="react-select-timezone-input-placeholder"
-                            aria-expanded="false"
-                            aria-haspopup="true"
-                            autocapitalize="none"
-                            autocomplete="off"
-                            autocorrect="off"
-                            class="Select__input"
-                            id="timezone-input"
-                            role="combobox"
-                            spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                            tabindex="0"
-                            type="text"
-                            value=""
-                          />
-                        </div>
-                      </div>
-                      <div
-                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                      >
-                        <span
-                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                        />
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="css-tj5bde-Svg"
-                            focusable="false"
-                            height="20"
-                            viewBox="0 0 20 20"
-                            width="20"
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-timezone-input-placeholder"
                           >
-                            <path
-                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-timezone-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="timezone-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
                             />
-                          </svg>
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -646,6 +696,7 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/preferences/__snapshots__/hiding-of-empty-branches.test.tsx.snap b/src/features/preferences/__snapshots__/hiding-of-empty-branches.test.tsx.snap
new file mode 100644
index 0000000000..c07aa6aeab
--- /dev/null
+++ b/src/features/preferences/__snapshots__/hiding-of-empty-branches.test.tsx.snap
@@ -0,0 +1,2136 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`preferences - hiding-of-empty-branches, given in preferences page given tab group and empty tabs renders 1`] = `
+<div>
+  <div
+    class="ClusterManager"
+  >
+    <div
+      class="topBar"
+    >
+      <div
+        class="items"
+      >
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
+      </div>
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                data-preference-tab-group-test="general-tab-group"
+              >
+                <div
+                  class="header flex items-center"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              data-preference-page-test="application-page"
+              id="application-page"
+            >
+              <h2
+                data-preference-page-title-test="true"
+              >
+                Application
+              </h2>
+              <div
+                data-preference-item-test="theme"
+              >
+                <section
+                  id="appearance"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
+              >
+                <section
+                  id="extensionRegistryUrl"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
+                  <label
+                    class="Switch"
+                    data-testid="switch"
+                  >
+                    Automatically start Lens on login
+                    <input
+                      role="switch"
+                      type="checkbox"
+                    />
+                  </label>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
+              >
+                <section
+                  id="update-channel"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
+                        >
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
+              >
+                <section
+                  id="locale"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+      data-testid="status-bar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      />
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
+
+exports[`preferences - hiding-of-empty-branches, given in preferences page given tab group and empty tabs when an item appears for one of the tabs renders 1`] = `
+<div>
+  <div
+    class="ClusterManager"
+  >
+    <div
+      class="topBar"
+    >
+      <div
+        class="items"
+      >
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
+      </div>
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                data-preference-tab-group-test="general-tab-group"
+              >
+                <div
+                  class="header flex items-center"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+              <div
+                class="TabSeparator"
+              >
+                <div
+                  class="HorizontalLine size-sm"
+                />
+              </div>
+              <div
+                data-preference-tab-group-test="some-tab-group"
+              >
+                <div
+                  class="header flex items-center"
+                >
+                  Some tab group label
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="some-path-id-for-some-tab-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Some tab label
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              data-preference-page-test="application-page"
+              id="application-page"
+            >
+              <h2
+                data-preference-page-title-test="true"
+              >
+                Application
+              </h2>
+              <div
+                data-preference-item-test="theme"
+              >
+                <section
+                  id="appearance"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
+              >
+                <section
+                  id="extensionRegistryUrl"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
+                  <label
+                    class="Switch"
+                    data-testid="switch"
+                  >
+                    Automatically start Lens on login
+                    <input
+                      role="switch"
+                      type="checkbox"
+                    />
+                  </label>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
+              >
+                <section
+                  id="update-channel"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
+                        >
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
+              >
+                <section
+                  id="locale"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+      data-testid="status-bar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      />
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
+
+exports[`preferences - hiding-of-empty-branches, given in preferences page given tab group and empty tabs when an item appears for one of the tabs when an item appears for the remaining tab renders 1`] = `
+<div>
+  <div
+    class="ClusterManager"
+  >
+    <div
+      class="topBar"
+    >
+      <div
+        class="items"
+      >
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
+      </div>
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                data-preference-tab-group-test="general-tab-group"
+              >
+                <div
+                  class="header flex items-center"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+              <div
+                class="TabSeparator"
+              >
+                <div
+                  class="HorizontalLine size-sm"
+                />
+              </div>
+              <div
+                data-preference-tab-group-test="some-tab-group"
+              >
+                <div
+                  class="header flex items-center"
+                >
+                  Some tab group label
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="some-path-id-for-some-tab-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Some tab label
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="some-path-id-for-some-other-tab-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Some other tab label
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              data-preference-page-test="application-page"
+              id="application-page"
+            >
+              <h2
+                data-preference-page-title-test="true"
+              >
+                Application
+              </h2>
+              <div
+                data-preference-item-test="theme"
+              >
+                <section
+                  id="appearance"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
+              >
+                <section
+                  id="extensionRegistryUrl"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
+                  <label
+                    class="Switch"
+                    data-testid="switch"
+                  >
+                    Automatically start Lens on login
+                    <input
+                      role="switch"
+                      type="checkbox"
+                    />
+                  </label>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
+              >
+                <section
+                  id="update-channel"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
+                        >
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
+              >
+                <section
+                  id="locale"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+      data-testid="status-bar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      />
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
diff --git a/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
index d30c193738..fc951ae75a 100644
--- a/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
@@ -11,44 +11,62 @@ exports[`preferences - navigation to application preferences given in some child
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -56,7 +74,6 @@ exports[`preferences - navigation to application preferences given in some child
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="proxy-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -68,68 +85,72 @@ exports[`preferences - navigation to application preferences given in some child
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
             </div>
@@ -143,76 +164,81 @@ exports[`preferences - navigation to application preferences given in some child
             class="content"
           >
             <section
-              id="proxy"
+              data-preference-page-test="proxy-page"
+              id="proxy-page"
             >
-              <section>
-                <h2
-                  data-testid="proxy-header"
-                >
-                  Proxy
-                </h2>
-                <div
-                  class="SubTitle"
-                >
-                  HTTP Proxy
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+              <h2
+                data-preference-page-title-test="true"
+              >
+                Proxy
+              </h2>
+              <div
+                data-preference-item-test="http-proxy-url"
+              >
+                <section>
+                  <div
+                    class="SubTitle"
                   >
+                    HTTP Proxy
+                     
+                  </div>
+                  <div
+                    class="Input theme round black"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        placeholder="Type HTTP proxy url (example: http://proxy.acme.org:8080)"
+                        spellcheck="false"
+                        value=""
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                  <small
+                    class="hint"
+                  >
+                    Proxy is used only for non-cluster communication.
+                  </small>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-sm"
+              />
+              <div
+                data-preference-item-test="allow-untrusted-certificates"
+              >
+                <section
+                  class="small"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Certificate Trust
+                     
+                  </div>
+                  <label
+                    class="Switch"
+                    data-testid="switch"
+                  >
+                    Allow untrusted Certificate Authorities
                     <input
-                      class="input box grow"
-                      placeholder="Type HTTP proxy url (example: http://proxy.acme.org:8080)"
-                      spellcheck="false"
-                      value=""
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <small
-                  class="hint"
-                >
-                  Proxy is used only for non-cluster communication.
-                </small>
-              </section>
-              <hr
-                class="small"
-              />
-              <section
-                class="small"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Certificate Trust
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Allow untrusted Certificate Authorities
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-                <small
-                  class="hint"
-                >
-                  This will make Lens to trust ANY certificate authority without any validations.
-                   
-                  Needed with some corporate proxies that do certificate re-writing.
-                   
-                  Does not affect cluster communications!
-                </small>
-              </section>
+                  <small
+                    class="hint"
+                  >
+                    This will make Lens to trust ANY certificate authority without any validations. Needed with some corporate proxies that do certificate re-writing. Does not affect cluster communications!
+                  </small>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -297,6 +323,7 @@ exports[`preferences - navigation to application preferences given in some child
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -325,44 +352,62 @@ exports[`preferences - navigation to application preferences given in some child
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -370,7 +415,6 @@ exports[`preferences - navigation to application preferences given in some child
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -382,68 +426,72 @@ exports[`preferences - navigation to application preferences given in some child
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
             </div>
@@ -457,400 +505,429 @@ exports[`preferences - navigation to application preferences given in some child
             class="content"
           >
             <section
-              id="application"
+              data-preference-page-test="application-page"
+              id="application-page"
             >
               <h2
-                data-testid="application-header"
+                data-preference-page-title-test="true"
               >
                 Application
               </h2>
-              <section
-                id="appearance"
+              <div
+                data-preference-item-test="theme"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="appearance"
                 >
-                  Theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-theme-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="extensionRegistryUrl"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="extensionRegistryUrl"
                 >
-                  Extension Install Registry
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-extension-install-registry-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-extension-install-registry-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-extension-install-registry-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="extension-install-registry-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <p
-                  class="mt-4 mb-5 leading-relaxed"
-                >
-                  This setting is to change the registry URL for installing extensions by name. 
-                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                  <b>
-                    .npmrc
-                  </b>
-                   file or in the input below.
-                </p>
-                <div
-                  class="Input theme round black disabled invalid"
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
                 >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
                   <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="Switch"
+                    data-testid="switch"
                   >
+                    Automatically start Lens on login
                     <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="Custom Extension Registry URL..."
-                      spellcheck="false"
-                      value="some-custom-url"
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <hr />
-              <section
-                id="other"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="update-channel"
                 >
-                  Start-up
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Automatically start Lens on login
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <hr />
-              <section
-                id="update-channel"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Update Channel
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-update-channel-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__single-value css-qc6sy-singleValue"
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                       >
-                        Stable
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="update-channel-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="locale"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="locale"
                 >
-                  Locale Timezone
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-timezone-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-timezone-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-timezone-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="timezone-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -935,6 +1012,7 @@ exports[`preferences - navigation to application preferences given in some child
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -951,3 +1029,694 @@ exports[`preferences - navigation to application preferences given in some child
   />
 </div>
 `;
+
+exports[`preferences - navigation to application preferences given in some child page of preferences, when rendered when navigating to preferences without specifying the tab renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  data-preference-tab-group-test="general-tab-group"
+                >
+                  <div
+                    class="header flex items-center"
+                  >
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                data-preference-page-test="application-page"
+                id="application-page"
+              >
+                <h2
+                  data-preference-page-title-test="true"
+                >
+                  Application
+                </h2>
+                <div
+                  data-preference-item-test="theme"
+                >
+                  <section
+                    id="appearance"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      Theme
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-theme-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control css-1s2u09g-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-theme-input-placeholder"
+                          >
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-theme-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="theme-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="extension-install-registry"
+                >
+                  <section
+                    id="extensionRegistryUrl"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      Extension Install Registry
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-extension-install-registry-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control css-1s2u09g-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-extension-install-registry-input-placeholder"
+                          >
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-extension-install-registry-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="extension-install-registry-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <p
+                      class="mt-4 mb-5 leading-relaxed"
+                    >
+                      This setting is to change the registry URL for installing extensions by name. 
+                      If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                      <b>
+                        .npmrc
+                      </b>
+                       file or in the input below.
+                    </p>
+                    <div
+                      class="Input theme round black disabled invalid"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="Custom Extension Registry URL..."
+                          spellcheck="false"
+                          value="some-custom-url"
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="start-up"
+                >
+                  <section
+                    id="other"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      Start-up
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Automatically start Lens on login
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="update-channel"
+                >
+                  <section
+                    id="update-channel"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      Update Channel
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-update-channel-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control css-1s2u09g-control"
+                      >
+                        <div
+                          class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__single-value css-qc6sy-singleValue"
+                          >
+                            Stable
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="update-channel-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="timezone"
+                >
+                  <section
+                    id="locale"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      Locale Timezone
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-timezone-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control css-1s2u09g-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-timezone-input-placeholder"
+                          >
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-timezone-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="timezone-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
diff --git a/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
index a5f0f25565..a21e6662c3 100644
--- a/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
@@ -11,44 +11,62 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -56,7 +74,6 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -68,68 +85,72 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
             </div>
@@ -143,400 +164,429 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
             class="content"
           >
             <section
-              id="application"
+              data-preference-page-test="application-page"
+              id="application-page"
             >
               <h2
-                data-testid="application-header"
+                data-preference-page-title-test="true"
               >
                 Application
               </h2>
-              <section
-                id="appearance"
+              <div
+                data-preference-item-test="theme"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="appearance"
                 >
-                  Theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-theme-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="extensionRegistryUrl"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="extensionRegistryUrl"
                 >
-                  Extension Install Registry
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-extension-install-registry-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-extension-install-registry-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-extension-install-registry-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="extension-install-registry-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <p
-                  class="mt-4 mb-5 leading-relaxed"
-                >
-                  This setting is to change the registry URL for installing extensions by name. 
-                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                  <b>
-                    .npmrc
-                  </b>
-                   file or in the input below.
-                </p>
-                <div
-                  class="Input theme round black disabled invalid"
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
                 >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
                   <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="Switch"
+                    data-testid="switch"
                   >
+                    Automatically start Lens on login
                     <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="Custom Extension Registry URL..."
-                      spellcheck="false"
-                      value="some-custom-url"
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <hr />
-              <section
-                id="other"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="update-channel"
                 >
-                  Start-up
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Automatically start Lens on login
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <hr />
-              <section
-                id="update-channel"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Update Channel
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-update-channel-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__single-value css-qc6sy-singleValue"
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                       >
-                        Stable
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="update-channel-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="locale"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="locale"
                 >
-                  Locale Timezone
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-timezone-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-timezone-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-timezone-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="timezone-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -621,6 +671,7 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -649,44 +700,62 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -694,7 +763,6 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="editor-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -706,68 +774,72 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
             </div>
@@ -781,284 +853,317 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
             class="content"
           >
             <section
-              id="editor"
+              data-preference-page-test="editor-page"
+              id="editor-page"
             >
               <h2
-                data-testid="editor-configuration-header"
+                data-preference-page-title-test="true"
               >
-                Editor configuration
+                Editor
               </h2>
               <div
-                class="SubTitle"
+                data-preference-item-test="minimap"
               >
-                Minimap
-                 
-              </div>
-              <section>
-                <div
-                  class="flex gaps justify-space-between"
-                >
+                <section>
                   <div
-                    class="flex gaps align-center"
+                    class="SubTitle"
+                  >
+                    Minimap
+                     
+                  </div>
+                  <div
+                    class="flex gaps justify-space-between"
+                  >
+                    <div
+                      class="flex gaps align-center"
+                    >
+                      <label
+                        class="Switch"
+                        data-testid="switch"
+                      >
+                        Show minimap
+                        <input
+                          role="switch"
+                          type="checkbox"
+                        />
+                      </label>
+                    </div>
+                    <div
+                      class="flex gaps align-center"
+                    >
+                      <div
+                        class="SubHeader compact"
+                      >
+                        Position
+                      </div>
+                      <div
+                        class="Select theme-lens css-b62m3t-container"
+                      >
+                        <span
+                          class="css-1f43avz-a11yText-A11yText"
+                          id="react-select-minimap-input-live-region"
+                        />
+                        <span
+                          aria-atomic="false"
+                          aria-live="polite"
+                          aria-relevant="additions text"
+                          class="css-1f43avz-a11yText-A11yText"
+                        />
+                        <div
+                          class="Select__control css-1s2u09g-control"
+                        >
+                          <div
+                            class="Select__value-container css-319lph-ValueContainer"
+                          >
+                            <div
+                              class="Select__placeholder css-14el2xx-placeholder"
+                              id="react-select-minimap-input-placeholder"
+                            >
+                              Select...
+                            </div>
+                            <div
+                              class="Select__input-container css-6j8wv5-Input"
+                              data-value=""
+                            >
+                              <input
+                                aria-autocomplete="list"
+                                aria-describedby="react-select-minimap-input-placeholder"
+                                aria-expanded="false"
+                                aria-haspopup="true"
+                                autocapitalize="none"
+                                autocomplete="off"
+                                autocorrect="off"
+                                class="Select__input"
+                                id="minimap-input"
+                                role="combobox"
+                                spellcheck="false"
+                                style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                tabindex="0"
+                                type="text"
+                                value=""
+                              />
+                            </div>
+                          </div>
+                          <div
+                            class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                          >
+                            <span
+                              class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            />
+                            <div
+                              aria-hidden="true"
+                              class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                            >
+                              <svg
+                                aria-hidden="true"
+                                class="css-tj5bde-Svg"
+                                focusable="false"
+                                height="20"
+                                viewBox="0 0 20 20"
+                                width="20"
+                              >
+                                <path
+                                  d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                />
+                              </svg>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="size-xl"
+              />
+              <div
+                data-preference-item-test="line-numbers"
+              >
+                <section>
+                  <div
+                    class="SubTitle"
+                  >
+                    Line numbers
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-editor-line-numbers-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-editor-line-numbers-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-editor-line-numbers-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="editor-line-numbers-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="size-xl"
+              />
+              <div
+                data-preference-item-test="tab-size"
+              >
+                <section>
+                  <div
+                    class="SubTitle"
+                  >
+                    Tab size
+                     
+                  </div>
+                  <div
+                    class="Input theme round black"
                   >
                     <label
-                      class="Switch"
-                      data-testid="switch"
+                      class="input-area flex gaps align-center"
+                      id=""
                     >
-                      Show minimap
                       <input
-                        role="switch"
-                        type="checkbox"
+                        class="input box grow"
+                        min="1"
+                        spellcheck="false"
+                        type="number"
+                        value="42"
                       />
                     </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="size-xl"
+              />
+              <div
+                data-preference-item-test="editor-font-size"
+              >
+                <section>
+                  <div
+                    class="SubTitle"
+                  >
+                    Font size
+                     
                   </div>
                   <div
-                    class="flex gaps align-center"
+                    class="Input theme round black"
                   >
-                    <div
-                      class="SubHeader compact"
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
                     >
-                      Position
-                    </div>
+                      <input
+                        class="input box grow"
+                        min="10"
+                        spellcheck="false"
+                        type="number"
+                        value="42"
+                      />
+                    </label>
                     <div
-                      class="Select theme-lens css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-minimap-input-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-minimap-input-placeholder"
-                          >
-                            Select...
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-minimap-input-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="minimap-input"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
+                      class="input-info flex gaps"
+                    />
                   </div>
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Line numbers
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-editor-line-numbers-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
+                </section>
+              </div>
+              <div
+                class="size-xl"
+              />
+              <div
+                data-preference-item-test="editor-font-family"
+              >
+                <section>
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-editor-line-numbers-input-placeholder"
-                      >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-editor-line-numbers-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="editor-line-numbers-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    Font family
+                     
                   </div>
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Tab size
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      min="1"
-                      spellcheck="false"
-                      type="number"
-                      value="42"
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Font size
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="Input theme round black"
                   >
-                    <input
-                      class="input box grow"
-                      min="10"
-                      spellcheck="false"
-                      type="number"
-                      value="42"
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        spellcheck="false"
+                        type="text"
+                        value=""
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
                     />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Font family
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      spellcheck="false"
-                      type="text"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
+                  </div>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -1143,6 +1248,7 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
index e0357f140f..352b2771d5 100644
--- a/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
@@ -1,2854 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extension with registered tab shows extension tab in general area 1`] = `
-<div
-  class="Tab flex gaps align-center"
-  data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
-  role="tab"
-  tabindex="0"
->
-  <div
-    class="label"
-  >
-    Metrics tab
-  </div>
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extension with registered tab when navigating to specific extension tab renders 1`] = `
-<div>
-  <div
-    class="ClusterManager"
-  >
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <main>
-      <div
-        id="lens-views"
-      />
-      <div
-        class="SettingLayout showNavigation Preferences"
-        data-testid="extension-preferences-page"
-      >
-        <nav
-          class="sidebarRegion"
-        >
-          <div
-            class="sidebar"
-          >
-            <div
-              class="Tabs flex column"
-            >
-              <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  App
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Proxy
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Metrics tab
-                </div>
-              </div>
-            </div>
-          </div>
-        </nav>
-        <div
-          class="contentRegion"
-          id="ScrollSpyRoot"
-        >
-          <div
-            class="content"
-          >
-            <section
-              id="extensions"
-            >
-              <h2
-                data-testid="extension-preferences-page-title"
-              >
-                Metrics tab
-              </h2>
-              <section
-                class="small"
-                data-testid="extension-preference-item-for-metrics-preference-item-id"
-                id="metrics-preference-item-id"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  License item
-                   
-                </div>
-                <div
-                  data-testid="metrics-preference-item-input"
-                />
-                <div
-                  class="hint"
-                >
-                  <div
-                    data-testid="metrics-preference-item-hint"
-                  />
-                </div>
-              </section>
-              <hr
-                class="small"
-              />
-            </section>
-          </div>
-          <div
-            class="toolsRegion"
-          >
-            <div
-              class="fixed top-[60px]"
-            >
-              <div
-                data-testid="close-preferences"
-              >
-                <div
-                  aria-label="Close"
-                  class="closeButton"
-                  role="button"
-                >
-                  <i
-                    class="Icon icon material focusable"
-                  >
-                    <span
-                      class="icon"
-                      data-icon-name="close"
-                    >
-                      close
-                    </span>
-                  </i>
-                </div>
-                <div
-                  aria-hidden="true"
-                  class="esc"
-                >
-                  ESC
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </main>
-    <div
-      class="HotbarMenu flex column"
-    >
-      <div
-        class="HotbarItems flex column gaps"
-      />
-      <div
-        class="HotbarSelector"
-      >
-        <i
-          class="Icon Icon previous material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_left"
-          >
-            arrow_left
-          </span>
-        </i>
-        <div
-          class="HotbarIndex"
-        >
-          <div
-            class="badge Badge small clickable"
-            id="hotbarIndex"
-          >
-            0
-          </div>
-        </div>
-        <i
-          class="Icon material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_right"
-          >
-            arrow_right
-          </span>
-        </i>
-      </div>
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      />
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extensions with tabs having same id when navigating to first extension tab renders 1`] = `
-<div>
-  <div
-    class="ClusterManager"
-  >
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <main>
-      <div
-        id="lens-views"
-      />
-      <div
-        class="SettingLayout showNavigation Preferences"
-        data-testid="extension-preferences-page"
-      >
-        <nav
-          class="sidebarRegion"
-        >
-          <div
-            class="sidebar"
-          >
-            <div
-              class="Tabs flex column"
-            >
-              <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  App
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Proxy
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Metrics tab
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Metrics tab
-                </div>
-              </div>
-            </div>
-          </div>
-        </nav>
-        <div
-          class="contentRegion"
-          id="ScrollSpyRoot"
-        >
-          <div
-            class="content"
-          >
-            <section
-              id="extensions"
-            >
-              <h2
-                data-testid="extension-preferences-page-title"
-              >
-                Metrics tab
-              </h2>
-              <section
-                class="small"
-                data-testid="extension-preference-item-for-metrics-preference-item-id"
-                id="metrics-preference-item-id"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  License item
-                   
-                </div>
-                <div
-                  data-testid="metrics-preference-item-input"
-                />
-                <div
-                  class="hint"
-                >
-                  <div
-                    data-testid="metrics-preference-item-hint"
-                  />
-                </div>
-              </section>
-              <hr
-                class="small"
-              />
-            </section>
-          </div>
-          <div
-            class="toolsRegion"
-          >
-            <div
-              class="fixed top-[60px]"
-            >
-              <div
-                data-testid="close-preferences"
-              >
-                <div
-                  aria-label="Close"
-                  class="closeButton"
-                  role="button"
-                >
-                  <i
-                    class="Icon icon material focusable"
-                  >
-                    <span
-                      class="icon"
-                      data-icon-name="close"
-                    >
-                      close
-                    </span>
-                  </i>
-                </div>
-                <div
-                  aria-hidden="true"
-                  class="esc"
-                >
-                  ESC
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </main>
-    <div
-      class="HotbarMenu flex column"
-    >
-      <div
-        class="HotbarItems flex column gaps"
-      />
-      <div
-        class="HotbarSelector"
-      >
-        <i
-          class="Icon Icon previous material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_left"
-          >
-            arrow_left
-          </span>
-        </i>
-        <div
-          class="HotbarIndex"
-        >
-          <div
-            class="badge Badge small clickable"
-            id="hotbarIndex"
-          >
-            0
-          </div>
-        </div>
-        <i
-          class="Icon material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_right"
-          >
-            arrow_right
-          </span>
-        </i>
-      </div>
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      />
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extensions with tabs having same id when navigating to second extension tab renders 1`] = `
-<div>
-  <div
-    class="ClusterManager"
-  >
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <main>
-      <div
-        id="lens-views"
-      />
-      <div
-        class="SettingLayout showNavigation Preferences"
-        data-testid="extension-preferences-page"
-      >
-        <nav
-          class="sidebarRegion"
-        >
-          <div
-            class="sidebar"
-          >
-            <div
-              class="Tabs flex column"
-            >
-              <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  App
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Proxy
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Metrics tab
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Metrics tab
-                </div>
-              </div>
-            </div>
-          </div>
-        </nav>
-        <div
-          class="contentRegion"
-          id="ScrollSpyRoot"
-        >
-          <div
-            class="content"
-          >
-            <section
-              id="extensions"
-            >
-              <h2
-                data-testid="extension-preferences-page-title"
-              >
-                Metrics tab
-              </h2>
-              <section
-                class="small"
-                data-testid="extension-preference-item-for-another-metrics-preference-item-id"
-                id="another-metrics-preference-item-id"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Another metrics
-                   
-                </div>
-                <div
-                  data-testid="another-metrics-preference-item-input"
-                />
-                <div
-                  class="hint"
-                >
-                  <div
-                    data-testid="another-metrics-preference-item-hint"
-                  />
-                </div>
-              </section>
-              <hr
-                class="small"
-              />
-            </section>
-          </div>
-          <div
-            class="toolsRegion"
-          >
-            <div
-              class="fixed top-[60px]"
-            >
-              <div
-                data-testid="close-preferences"
-              >
-                <div
-                  aria-label="Close"
-                  class="closeButton"
-                  role="button"
-                >
-                  <i
-                    class="Icon icon material focusable"
-                  >
-                    <span
-                      class="icon"
-                      data-icon-name="close"
-                    >
-                      close
-                    </span>
-                  </i>
-                </div>
-                <div
-                  aria-hidden="true"
-                  class="esc"
-                >
-                  ESC
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </main>
-    <div
-      class="HotbarMenu flex column"
-    >
-      <div
-        class="HotbarItems flex column gaps"
-      />
-      <div
-        class="HotbarSelector"
-      >
-        <i
-          class="Icon Icon previous material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_left"
-          >
-            arrow_left
-          </span>
-        </i>
-        <div
-          class="HotbarIndex"
-        >
-          <div
-            class="badge Badge small clickable"
-            id="hotbarIndex"
-          >
-            0
-          </div>
-        </div>
-        <i
-          class="Icon material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_right"
-          >
-            arrow_right
-          </span>
-        </i>
-      </div>
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      />
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given multiple extensions with specific preferences, when navigating to extension specific preferences page renders 1`] = `
-<div>
-  <div
-    class="ClusterManager"
-  >
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <main>
-      <div
-        id="lens-views"
-      />
-      <div
-        class="SettingLayout showNavigation Preferences"
-        data-testid="extension-preferences-page"
-      >
-        <nav
-          class="sidebarRegion"
-        >
-          <div
-            class="sidebar"
-          >
-            <div
-              class="Tabs flex column"
-            >
-              <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  App
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Proxy
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <div
-                data-testid="extension-settings"
-              >
-                <hr />
-                <div
-                  class="header flex items-center"
-                >
-                  <i
-                    class="Icon mr-3 material focusable smallest"
-                  >
-                    <span
-                      class="icon"
-                      data-icon-name="extension"
-                    >
-                      extension
-                    </span>
-                  </i>
-                   
-                  Extensions
-                </div>
-                <div>
-                  <div
-                    class="Tab flex gaps align-center active"
-                    data-testid="tab-link-for-extension-some-test-extension-id"
-                    role="tab"
-                    tabindex="0"
-                  >
-                    <div
-                      class="label"
-                    >
-                      some-test-extension-id
-                    </div>
-                  </div>
-                  <div
-                    class="Tab flex gaps align-center"
-                    data-testid="tab-link-for-extension-some-other-test-extension-id"
-                    role="tab"
-                    tabindex="0"
-                  >
-                    <div
-                      class="label"
-                    >
-                      some-other-test-extension-id
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </nav>
-        <div
-          class="contentRegion"
-          id="ScrollSpyRoot"
-        >
-          <div
-            class="content"
-          >
-            <section
-              id="extensions"
-            >
-              <h2
-                data-testid="extension-preferences-page-title"
-              >
-                some-test-extension-id preferences
-              </h2>
-              <section
-                class="small"
-                data-testid="extension-preference-item-for-some-preference-item-id"
-                id="some-preference-item-id"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Some preference item
-                   
-                </div>
-                <div
-                  data-testid="some-preference-item-input"
-                />
-                <div
-                  class="hint"
-                >
-                  <div
-                    data-testid="some-preference-item-hint"
-                  />
-                </div>
-              </section>
-              <hr
-                class="small"
-              />
-            </section>
-          </div>
-          <div
-            class="toolsRegion"
-          >
-            <div
-              class="fixed top-[60px]"
-            >
-              <div
-                data-testid="close-preferences"
-              >
-                <div
-                  aria-label="Close"
-                  class="closeButton"
-                  role="button"
-                >
-                  <i
-                    class="Icon icon material focusable"
-                  >
-                    <span
-                      class="icon"
-                      data-icon-name="close"
-                    >
-                      close
-                    </span>
-                  </i>
-                </div>
-                <div
-                  aria-hidden="true"
-                  class="esc"
-                >
-                  ESC
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </main>
-    <div
-      class="HotbarMenu flex column"
-    >
-      <div
-        class="HotbarItems flex column gaps"
-      />
-      <div
-        class="HotbarSelector"
-      >
-        <i
-          class="Icon Icon previous material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_left"
-          >
-            arrow_left
-          </span>
-        </i>
-        <div
-          class="HotbarIndex"
-        >
-          <div
-            class="badge Badge small clickable"
-            id="hotbarIndex"
-          >
-            0
-          </div>
-        </div>
-        <i
-          class="Icon material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_right"
-          >
-            arrow_right
-          </span>
-        </i>
-      </div>
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      />
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered renders 1`] = `
-<div>
-  <div
-    class="ClusterManager"
-  >
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <main>
-      <div
-        id="lens-views"
-      />
-      <div
-        class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
-      >
-        <nav
-          class="sidebarRegion"
-        >
-          <div
-            class="sidebar"
-          >
-            <div
-              class="Tabs flex column"
-            >
-              <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  App
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Proxy
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-            </div>
-          </div>
-        </nav>
-        <div
-          class="contentRegion"
-          id="ScrollSpyRoot"
-        >
-          <div
-            class="content"
-          >
-            <section
-              id="application"
-            >
-              <h2
-                data-testid="application-header"
-              >
-                Application
-              </h2>
-              <section
-                id="appearance"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control css-1s2u09g-control"
-                  >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-theme-input-placeholder"
-                      >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="extensionRegistryUrl"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Extension Install Registry
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-extension-install-registry-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control css-1s2u09g-control"
-                  >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-extension-install-registry-input-placeholder"
-                      >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-extension-install-registry-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="extension-install-registry-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <p
-                  class="mt-4 mb-5 leading-relaxed"
-                >
-                  This setting is to change the registry URL for installing extensions by name. 
-                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                  <b>
-                    .npmrc
-                  </b>
-                   file or in the input below.
-                </p>
-                <div
-                  class="Input theme round black disabled invalid"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="Custom Extension Registry URL..."
-                      spellcheck="false"
-                      value="some-custom-url"
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <hr />
-              <section
-                id="other"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Start-up
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Automatically start Lens on login
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <hr />
-              <section
-                id="update-channel"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Update Channel
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-update-channel-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control css-1s2u09g-control"
-                  >
-                    <div
-                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__single-value css-qc6sy-singleValue"
-                      >
-                        Stable
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="update-channel-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="locale"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Locale Timezone
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-timezone-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control css-1s2u09g-control"
-                  >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-timezone-input-placeholder"
-                      >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-timezone-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="timezone-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </section>
-            </section>
-          </div>
-          <div
-            class="toolsRegion"
-          >
-            <div
-              class="fixed top-[60px]"
-            >
-              <div
-                data-testid="close-preferences"
-              >
-                <div
-                  aria-label="Close"
-                  class="closeButton"
-                  role="button"
-                >
-                  <i
-                    class="Icon icon material focusable"
-                  >
-                    <span
-                      class="icon"
-                      data-icon-name="close"
-                    >
-                      close
-                    </span>
-                  </i>
-                </div>
-                <div
-                  aria-hidden="true"
-                  class="esc"
-                >
-                  ESC
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </main>
-    <div
-      class="HotbarMenu flex column"
-    >
-      <div
-        class="HotbarItems flex column gaps"
-      />
-      <div
-        class="HotbarSelector"
-      >
-        <i
-          class="Icon Icon previous material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_left"
-          >
-            arrow_left
-          </span>
-        </i>
-        <div
-          class="HotbarIndex"
-        >
-          <div
-            class="badge Badge small clickable"
-            id="hotbarIndex"
-          >
-            0
-          </div>
-        </div>
-        <i
-          class="Icon material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_right"
-          >
-            arrow_right
-          </span>
-        </i>
-      </div>
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      />
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered when extension with specific preferences is enabled renders 1`] = `
-<div>
-  <div
-    class="ClusterManager"
-  >
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <main>
-      <div
-        id="lens-views"
-      />
-      <div
-        class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
-      >
-        <nav
-          class="sidebarRegion"
-        >
-          <div
-            class="sidebar"
-          >
-            <div
-              class="Tabs flex column"
-            >
-              <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  App
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Proxy
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <div
-                data-testid="extension-settings"
-              >
-                <hr />
-                <div
-                  class="header flex items-center"
-                >
-                  <i
-                    class="Icon mr-3 material focusable smallest"
-                  >
-                    <span
-                      class="icon"
-                      data-icon-name="extension"
-                    >
-                      extension
-                    </span>
-                  </i>
-                   
-                  Extensions
-                </div>
-                <div>
-                  <div
-                    class="Tab flex gaps align-center"
-                    data-testid="tab-link-for-extension-some-test-extension-id"
-                    role="tab"
-                    tabindex="0"
-                  >
-                    <div
-                      class="label"
-                    >
-                      some-test-extension-id
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </nav>
-        <div
-          class="contentRegion"
-          id="ScrollSpyRoot"
-        >
-          <div
-            class="content"
-          >
-            <section
-              id="application"
-            >
-              <h2
-                data-testid="application-header"
-              >
-                Application
-              </h2>
-              <section
-                id="appearance"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control css-1s2u09g-control"
-                  >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-theme-input-placeholder"
-                      >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="extensionRegistryUrl"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Extension Install Registry
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-extension-install-registry-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control css-1s2u09g-control"
-                  >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-extension-install-registry-input-placeholder"
-                      >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-extension-install-registry-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="extension-install-registry-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <p
-                  class="mt-4 mb-5 leading-relaxed"
-                >
-                  This setting is to change the registry URL for installing extensions by name. 
-                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                  <b>
-                    .npmrc
-                  </b>
-                   file or in the input below.
-                </p>
-                <div
-                  class="Input theme round black disabled invalid"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="Custom Extension Registry URL..."
-                      spellcheck="false"
-                      value="some-custom-url"
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <hr />
-              <section
-                id="other"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Start-up
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Automatically start Lens on login
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <hr />
-              <section
-                id="update-channel"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Update Channel
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-update-channel-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control css-1s2u09g-control"
-                  >
-                    <div
-                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__single-value css-qc6sy-singleValue"
-                      >
-                        Stable
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="update-channel-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="locale"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Locale Timezone
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-timezone-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control css-1s2u09g-control"
-                  >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-timezone-input-placeholder"
-                      >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-timezone-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="timezone-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </section>
-            </section>
-          </div>
-          <div
-            class="toolsRegion"
-          >
-            <div
-              class="fixed top-[60px]"
-            >
-              <div
-                data-testid="close-preferences"
-              >
-                <div
-                  aria-label="Close"
-                  class="closeButton"
-                  role="button"
-                >
-                  <i
-                    class="Icon icon material focusable"
-                  >
-                    <span
-                      class="icon"
-                      data-icon-name="close"
-                    >
-                      close
-                    </span>
-                  </i>
-                </div>
-                <div
-                  aria-hidden="true"
-                  class="esc"
-                >
-                  ESC
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </main>
-    <div
-      class="HotbarMenu flex column"
-    >
-      <div
-        class="HotbarItems flex column gaps"
-      />
-      <div
-        class="HotbarSelector"
-      >
-        <i
-          class="Icon Icon previous material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_left"
-          >
-            arrow_left
-          </span>
-        </i>
-        <div
-          class="HotbarIndex"
-        >
-          <div
-            class="badge Badge small clickable"
-            id="hotbarIndex"
-          >
-            0
-          </div>
-        </div>
-        <i
-          class="Icon material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_right"
-          >
-            arrow_right
-          </span>
-        </i>
-      </div>
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      />
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered when extension with specific preferences is enabled when navigating to extension preferences using navigation renders 1`] = `
-<div>
-  <div
-    class="ClusterManager"
-  >
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <main>
-      <div
-        id="lens-views"
-      />
-      <div
-        class="SettingLayout showNavigation Preferences"
-        data-testid="extension-preferences-page"
-      >
-        <nav
-          class="sidebarRegion"
-        >
-          <div
-            class="sidebar"
-          >
-            <div
-              class="Tabs flex column"
-            >
-              <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  App
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Proxy
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Kubernetes
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Editor
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  Terminal
-                </div>
-              </div>
-              <div
-                data-testid="extension-settings"
-              >
-                <hr />
-                <div
-                  class="header flex items-center"
-                >
-                  <i
-                    class="Icon mr-3 material focusable smallest"
-                  >
-                    <span
-                      class="icon"
-                      data-icon-name="extension"
-                    >
-                      extension
-                    </span>
-                  </i>
-                   
-                  Extensions
-                </div>
-                <div>
-                  <div
-                    class="Tab flex gaps align-center active"
-                    data-testid="tab-link-for-extension-some-test-extension-id"
-                    role="tab"
-                    tabindex="0"
-                  >
-                    <div
-                      class="label"
-                    >
-                      some-test-extension-id
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </nav>
-        <div
-          class="contentRegion"
-          id="ScrollSpyRoot"
-        >
-          <div
-            class="content"
-          >
-            <section
-              id="extensions"
-            >
-              <h2
-                data-testid="extension-preferences-page-title"
-              >
-                some-test-extension-id preferences
-              </h2>
-              <section
-                class="small"
-                data-testid="extension-preference-item-for-some-preference-item-id"
-                id="some-preference-item-id"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Some preference item
-                   
-                </div>
-                <div
-                  data-testid="some-preference-item-input"
-                />
-                <div
-                  class="hint"
-                >
-                  <div
-                    data-testid="some-preference-item-hint"
-                  />
-                </div>
-              </section>
-              <hr
-                class="small"
-              />
-            </section>
-          </div>
-          <div
-            class="toolsRegion"
-          >
-            <div
-              class="fixed top-[60px]"
-            >
-              <div
-                data-testid="close-preferences"
-              >
-                <div
-                  aria-label="Close"
-                  class="closeButton"
-                  role="button"
-                >
-                  <i
-                    class="Icon icon material focusable"
-                  >
-                    <span
-                      class="icon"
-                      data-icon-name="close"
-                    >
-                      close
-                    </span>
-                  </i>
-                </div>
-                <div
-                  aria-hidden="true"
-                  class="esc"
-                >
-                  ESC
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </main>
-    <div
-      class="HotbarMenu flex column"
-    >
-      <div
-        class="HotbarItems flex column gaps"
-      />
-      <div
-        class="HotbarSelector"
-      >
-        <i
-          class="Icon Icon previous material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_left"
-          >
-            arrow_left
-          </span>
-        </i>
-        <div
-          class="HotbarIndex"
-        >
-          <div
-            class="badge Badge small clickable"
-            id="hotbarIndex"
-          >
-            0
-          </div>
-        </div>
-        <i
-          class="Icon material interactive focusable"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_right"
-          >
-            arrow_right
-          </span>
-        </i>
-      </div>
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      />
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered when extension with specific preferences is enabled when navigating to extension preferences using navigation when extension is disabled renders 1`] = `
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extension with registered tab renders 1`] = `
 <body>
   <div>
     <div
@@ -2860,44 +12,62 @@ exports[`preferences - navigation to extension specific preferences given in pre
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -2905,7 +75,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="extension-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -2917,68 +86,84 @@ exports[`preferences - navigation to extension specific preferences given in pre
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="extension-registered-tab-page-id-metrics-extension-tab"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Metrics tab
+                    </div>
                   </div>
                 </div>
               </div>
@@ -2992,18 +177,428 @@ exports[`preferences - navigation to extension specific preferences given in pre
               class="content"
             >
               <section
-                id="extensions"
+                data-preference-page-test="application-page"
+                id="application-page"
               >
                 <h2
-                  data-testid="extension-preferences-page-title"
+                  data-preference-page-title-test="true"
                 >
-                  Extension preferences
+                  Application
                 </h2>
                 <div
-                  class="flex items-center"
-                  data-testid="error-for-extension-not-being-present"
+                  data-preference-item-test="theme"
                 >
-                  No extension found
+                  <section
+                    id="appearance"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      Theme
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-theme-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control css-1s2u09g-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-theme-input-placeholder"
+                          >
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-theme-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="theme-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="extension-install-registry"
+                >
+                  <section
+                    id="extensionRegistryUrl"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      Extension Install Registry
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-extension-install-registry-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control css-1s2u09g-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-extension-install-registry-input-placeholder"
+                          >
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-extension-install-registry-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="extension-install-registry-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <p
+                      class="mt-4 mb-5 leading-relaxed"
+                    >
+                      This setting is to change the registry URL for installing extensions by name. 
+                      If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                      <b>
+                        .npmrc
+                      </b>
+                       file or in the input below.
+                    </p>
+                    <div
+                      class="Input theme round black disabled invalid"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="Custom Extension Registry URL..."
+                          spellcheck="false"
+                          value="some-custom-url"
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="start-up"
+                >
+                  <section
+                    id="other"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      Start-up
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Automatically start Lens on login
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="update-channel"
+                >
+                  <section
+                    id="update-channel"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      Update Channel
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-update-channel-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control css-1s2u09g-control"
+                      >
+                        <div
+                          class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__single-value css-qc6sy-singleValue"
+                          >
+                            Stable
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="update-channel-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="timezone"
+                >
+                  <section
+                    id="locale"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      Locale Timezone
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-timezone-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control css-1s2u09g-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-timezone-input-placeholder"
+                          >
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-timezone-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="timezone-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
                 </div>
               </section>
             </div>
@@ -3089,6 +684,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -3107,7 +703,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
 </body>
 `;
 
-exports[`preferences - navigation to extension specific preferences when navigating to extension specific tab renders 1`] = `
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extension with registered tab when navigating to specific extension tab renders 1`] = `
 <div>
   <div
     class="ClusterManager"
@@ -3118,44 +714,62 @@ exports[`preferences - navigation to extension specific preferences when navigat
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -3163,7 +777,6 @@ exports[`preferences - navigation to extension specific preferences when navigat
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="extension-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -3175,80 +788,84 @@ exports[`preferences - navigation to extension specific preferences when navigat
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Metrics tab
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="extension-registered-tab-page-id-metrics-extension-tab"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Metrics tab
+                  </div>
                 </div>
               </div>
             </div>
@@ -3262,38 +879,42 @@ exports[`preferences - navigation to extension specific preferences when navigat
             class="content"
           >
             <section
-              id="extensions"
+              data-preference-page-test="preference-item-for-extension-registered-tab-page-id-additional-page-metrics-extension-tab"
+              id="preference-item-for-extension-registered-tab-page-id-additional-page-metrics-extension-tab"
             >
               <h2
-                data-testid="extension-preferences-page-title"
+                data-preference-page-title-test="true"
               >
                 Metrics tab
               </h2>
-              <section
-                class="small"
-                data-testid="extension-preference-item-for-another-metrics-preference-item-id"
-                id="another-metrics-preference-item-id"
+              <div
+                data-preference-item-test="preference-item-for-extension-registered-tab-page-id-item-metrics-preference-item-id"
               >
-                <div
-                  class="SubTitle"
-                >
-                  Another metrics
-                   
-                </div>
-                <div
-                  data-testid="another-metrics-preference-item-input"
-                />
-                <div
-                  class="hint"
+                <section
+                  class="small"
+                  id="metrics-preference-item-id"
                 >
                   <div
-                    data-testid="another-metrics-preference-item-hint"
+                    class="SubTitle"
+                  >
+                    License item
+                     
+                  </div>
+                  <div
+                    data-testid="metrics-preference-item-input"
                   />
-                </div>
-              </section>
-              <hr
-                class="small"
-              />
+                  <div
+                    class="hint"
+                  >
+                    <div
+                      data-testid="metrics-preference-item-hint"
+                    />
+                  </div>
+                </section>
+                <hr
+                  class="small"
+                />
+              </div>
             </section>
           </div>
           <div
@@ -3378,6 +999,7 @@ exports[`preferences - navigation to extension specific preferences when navigat
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -3395,7 +1017,7 @@ exports[`preferences - navigation to extension specific preferences when navigat
 </div>
 `;
 
-exports[`preferences - navigation to extension specific preferences when navigating to someone else extension specific tab renders 1`] = `
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extensions with tabs having same id when navigating to first extension tab renders 1`] = `
 <div>
   <div
     class="ClusterManager"
@@ -3406,44 +1028,62 @@ exports[`preferences - navigation to extension specific preferences when navigat
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -3451,7 +1091,6 @@ exports[`preferences - navigation to extension specific preferences when navigat
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="extension-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -3463,80 +1102,96 @@ exports[`preferences - navigation to extension specific preferences when navigat
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Metrics tab
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="extension-registered-tab-page-id-metrics-extension-tab"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Metrics tab
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="extension-duplicated-tab-page-id-metrics-extension-tab"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Metrics tab
+                  </div>
                 </div>
               </div>
             </div>
@@ -3550,38 +1205,42 @@ exports[`preferences - navigation to extension specific preferences when navigat
             class="content"
           >
             <section
-              id="extensions"
+              data-preference-page-test="preference-item-for-extension-registered-tab-page-id-additional-page-metrics-extension-tab"
+              id="preference-item-for-extension-registered-tab-page-id-additional-page-metrics-extension-tab"
             >
               <h2
-                data-testid="extension-preferences-page-title"
+                data-preference-page-title-test="true"
               >
-                extension-using-someone-else-tab-id preferences
+                Metrics tab
               </h2>
-              <section
-                class="small"
-                data-testid="extension-preference-item-for-my-preferences-item-id"
-                id="my-preferences-item-id"
+              <div
+                data-preference-item-test="preference-item-for-extension-registered-tab-page-id-item-metrics-preference-item-id"
               >
-                <div
-                  class="SubTitle"
-                >
-                  My preferences
-                   
-                </div>
-                <div
-                  data-testid="my-preferences-item-input"
-                />
-                <div
-                  class="hint"
+                <section
+                  class="small"
+                  id="metrics-preference-item-id"
                 >
                   <div
-                    data-testid="my-preferences-item-hint"
+                    class="SubTitle"
+                  >
+                    License item
+                     
+                  </div>
+                  <div
+                    data-testid="metrics-preference-item-input"
                   />
-                </div>
-              </section>
-              <hr
-                class="small"
-              />
+                  <div
+                    class="hint"
+                  >
+                    <div
+                      data-testid="metrics-preference-item-hint"
+                    />
+                  </div>
+                </section>
+                <hr
+                  class="small"
+                />
+              </div>
             </section>
           </div>
           <div
@@ -3666,6 +1325,7 @@ exports[`preferences - navigation to extension specific preferences when navigat
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -3682,3 +1342,2709 @@ exports[`preferences - navigation to extension specific preferences when navigat
   />
 </div>
 `;
+
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extensions with tabs having same id when navigating to second extension tab renders 1`] = `
+<div>
+  <div
+    class="ClusterManager"
+  >
+    <div
+      class="topBar"
+    >
+      <div
+        class="items"
+      >
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
+      </div>
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                data-preference-tab-group-test="general-tab-group"
+              >
+                <div
+                  class="header flex items-center"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="extension-registered-tab-page-id-metrics-extension-tab"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Metrics tab
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="extension-duplicated-tab-page-id-metrics-extension-tab"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Metrics tab
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              data-preference-page-test="preference-item-for-extension-duplicated-tab-page-id-additional-page-metrics-extension-tab"
+              id="preference-item-for-extension-duplicated-tab-page-id-additional-page-metrics-extension-tab"
+            >
+              <h2
+                data-preference-page-title-test="true"
+              >
+                Metrics tab
+              </h2>
+              <div
+                data-preference-item-test="preference-item-for-extension-duplicated-tab-page-id-item-another-metrics-preference-item-id"
+              >
+                <section
+                  class="small"
+                  id="another-metrics-preference-item-id"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Another metrics
+                     
+                  </div>
+                  <div
+                    data-testid="another-metrics-preference-item-input"
+                  />
+                  <div
+                    class="hint"
+                  >
+                    <div
+                      data-testid="another-metrics-preference-item-hint"
+                    />
+                  </div>
+                </section>
+                <hr
+                  class="small"
+                />
+              </div>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+      data-testid="status-bar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      />
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
+
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given multiple extensions with specific preferences, when navigating to extension specific preferences page renders 1`] = `
+<div>
+  <div
+    class="ClusterManager"
+  >
+    <div
+      class="topBar"
+    >
+      <div
+        class="items"
+      >
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
+      </div>
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                data-preference-tab-group-test="general-tab-group"
+              >
+                <div
+                  class="header flex items-center"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+              <div
+                class="TabSeparator"
+              >
+                <div
+                  class="HorizontalLine size-sm"
+                />
+              </div>
+              <div
+                data-preference-tab-group-test="extensions-tab-group"
+              >
+                <div
+                  class="header flex items-center"
+                >
+                  <i
+                    class="Icon mr-3 material focusable smallest"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="extension"
+                    >
+                      extension
+                    </span>
+                  </i>
+                  Extensions
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="some-test-extension-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    some-test-extension-id
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="some-other-test-extension-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    some-other-test-extension-id
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              data-preference-page-test="preference-item-for-extension-some-test-extension-id-page"
+              id="preference-item-for-extension-some-test-extension-id-page"
+            >
+              <h2
+                data-preference-page-title-test="true"
+              >
+                some-test-extension-id preferences
+              </h2>
+              <div
+                data-preference-item-test="preference-item-for-extension-some-test-extension-id-item-some-preference-item-id"
+              >
+                <section
+                  class="small"
+                  id="some-preference-item-id"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Some preference item
+                     
+                  </div>
+                  <div
+                    data-testid="some-preference-item-input"
+                  />
+                  <div
+                    class="hint"
+                  >
+                    <div
+                      data-testid="some-preference-item-hint"
+                    />
+                  </div>
+                </section>
+                <hr
+                  class="small"
+                />
+              </div>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+      data-testid="status-bar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      />
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
+
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered renders 1`] = `
+<div>
+  <div
+    class="ClusterManager"
+  >
+    <div
+      class="topBar"
+    >
+      <div
+        class="items"
+      >
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
+      </div>
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                data-preference-tab-group-test="general-tab-group"
+              >
+                <div
+                  class="header flex items-center"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              data-preference-page-test="application-page"
+              id="application-page"
+            >
+              <h2
+                data-preference-page-title-test="true"
+              >
+                Application
+              </h2>
+              <div
+                data-preference-item-test="theme"
+              >
+                <section
+                  id="appearance"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
+              >
+                <section
+                  id="extensionRegistryUrl"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
+                  <label
+                    class="Switch"
+                    data-testid="switch"
+                  >
+                    Automatically start Lens on login
+                    <input
+                      role="switch"
+                      type="checkbox"
+                    />
+                  </label>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
+              >
+                <section
+                  id="update-channel"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
+                        >
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
+              >
+                <section
+                  id="locale"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+      data-testid="status-bar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      />
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
+
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered when extension with specific preferences is enabled renders 1`] = `
+<div>
+  <div
+    class="ClusterManager"
+  >
+    <div
+      class="topBar"
+    >
+      <div
+        class="items"
+      >
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
+      </div>
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                data-preference-tab-group-test="general-tab-group"
+              >
+                <div
+                  class="header flex items-center"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+              <div
+                class="TabSeparator"
+              >
+                <div
+                  class="HorizontalLine size-sm"
+                />
+              </div>
+              <div
+                data-preference-tab-group-test="extensions-tab-group"
+              >
+                <div
+                  class="header flex items-center"
+                >
+                  <i
+                    class="Icon mr-3 material focusable smallest"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="extension"
+                    >
+                      extension
+                    </span>
+                  </i>
+                  Extensions
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="some-test-extension-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    some-test-extension-id
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              data-preference-page-test="application-page"
+              id="application-page"
+            >
+              <h2
+                data-preference-page-title-test="true"
+              >
+                Application
+              </h2>
+              <div
+                data-preference-item-test="theme"
+              >
+                <section
+                  id="appearance"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
+              >
+                <section
+                  id="extensionRegistryUrl"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
+                  <label
+                    class="Switch"
+                    data-testid="switch"
+                  >
+                    Automatically start Lens on login
+                    <input
+                      role="switch"
+                      type="checkbox"
+                    />
+                  </label>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
+              >
+                <section
+                  id="update-channel"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
+                        >
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
+              >
+                <section
+                  id="locale"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </div>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+      data-testid="status-bar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      />
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
+
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered when extension with specific preferences is enabled when navigating to extension preferences using navigation renders 1`] = `
+<div>
+  <div
+    class="ClusterManager"
+  >
+    <div
+      class="topBar"
+    >
+      <div
+        class="items"
+      >
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
+        >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
+      </div>
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                data-preference-tab-group-test="general-tab-group"
+              >
+                <div
+                  class="header flex items-center"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+              <div
+                class="TabSeparator"
+              >
+                <div
+                  class="HorizontalLine size-sm"
+                />
+              </div>
+              <div
+                data-preference-tab-group-test="extensions-tab-group"
+              >
+                <div
+                  class="header flex items-center"
+                >
+                  <i
+                    class="Icon mr-3 material focusable smallest"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="extension"
+                    >
+                      extension
+                    </span>
+                  </i>
+                  Extensions
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="some-test-extension-id"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    some-test-extension-id
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              data-preference-page-test="preference-item-for-extension-some-test-extension-id-page"
+              id="preference-item-for-extension-some-test-extension-id-page"
+            >
+              <h2
+                data-preference-page-title-test="true"
+              >
+                some-test-extension-id preferences
+              </h2>
+              <div
+                data-preference-item-test="preference-item-for-extension-some-test-extension-id-item-some-preference-item-id"
+              >
+                <section
+                  class="small"
+                  id="some-preference-item-id"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Some preference item
+                     
+                  </div>
+                  <div
+                    data-testid="some-preference-item-input"
+                  />
+                  <div
+                    class="hint"
+                  >
+                    <div
+                      data-testid="some-preference-item-hint"
+                    />
+                  </div>
+                </section>
+                <hr
+                  class="small"
+                />
+              </div>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+      data-testid="status-bar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      />
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
+
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered when extension with specific preferences is enabled when navigating to extension preferences using navigation when extension is disabled renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  data-preference-tab-group-test="general-tab-group"
+                >
+                  <div
+                    class="header flex items-center"
+                  >
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <div
+                class="flex items-center"
+                data-preference-page-does-not-exist-test="true"
+              >
+                No preferences found
+              </div>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
diff --git a/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
index f450498468..9f7766f027 100644
--- a/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
@@ -11,44 +11,62 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -56,7 +74,6 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -68,68 +85,72 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
             </div>
@@ -143,400 +164,429 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
             class="content"
           >
             <section
-              id="application"
+              data-preference-page-test="application-page"
+              id="application-page"
             >
               <h2
-                data-testid="application-header"
+                data-preference-page-title-test="true"
               >
                 Application
               </h2>
-              <section
-                id="appearance"
+              <div
+                data-preference-item-test="theme"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="appearance"
                 >
-                  Theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-theme-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="extensionRegistryUrl"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="extensionRegistryUrl"
                 >
-                  Extension Install Registry
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-extension-install-registry-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-extension-install-registry-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-extension-install-registry-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="extension-install-registry-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <p
-                  class="mt-4 mb-5 leading-relaxed"
-                >
-                  This setting is to change the registry URL for installing extensions by name. 
-                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                  <b>
-                    .npmrc
-                  </b>
-                   file or in the input below.
-                </p>
-                <div
-                  class="Input theme round black disabled invalid"
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
                 >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
                   <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="Switch"
+                    data-testid="switch"
                   >
+                    Automatically start Lens on login
                     <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="Custom Extension Registry URL..."
-                      spellcheck="false"
-                      value="some-custom-url"
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <hr />
-              <section
-                id="other"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="update-channel"
                 >
-                  Start-up
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Automatically start Lens on login
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <hr />
-              <section
-                id="update-channel"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Update Channel
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-update-channel-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__single-value css-qc6sy-singleValue"
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                       >
-                        Stable
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="update-channel-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="locale"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="locale"
                 >
-                  Locale Timezone
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-timezone-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-timezone-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-timezone-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="timezone-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -621,6 +671,7 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -649,44 +700,62 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -694,7 +763,6 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="kubernetes-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -706,68 +774,72 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
             </div>
@@ -781,231 +853,61 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
             class="content"
           >
             <section
-              id="kubernetes"
+              data-preference-page-test="kubernetes-page"
+              id="kubernetes-page"
             >
-              <section
-                id="kubectl"
+              <h2
+                data-preference-page-title-test="true"
               >
-                <h2
-                  data-testid="kubernetes-header"
+                Kubernetes
+              </h2>
+              <div
+                data-preference-item-test="kubectl"
+              >
+                <section
+                  id="kubectl"
                 >
-                  Kubernetes
-                </h2>
-                <section>
                   <div
-                    class="SubTitle"
+                    data-preference-item-test="kubectl-binary-download"
                   >
-                    Kubectl binary download
-                     
-                  </div>
-                  <label
-                    class="Switch"
-                    data-testid="switch"
-                  >
-                    Download kubectl binaries matching the Kubernetes cluster version
-                    <input
-                      role="switch"
-                      type="checkbox"
-                    />
-                  </label>
-                </section>
-                <section>
-                  <div
-                    class="SubTitle"
-                  >
-                    Download mirror
-                     
-                  </div>
-                  <div
-                    class="Select theme-lens Select--is-disabled css-3iigni-container"
-                  >
-                    <span
-                      class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-download-mirror-input-live-region"
-                    />
-                    <span
-                      aria-atomic="false"
-                      aria-live="polite"
-                      aria-relevant="additions text"
-                      class="css-1f43avz-a11yText-A11yText"
-                    />
-                    <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
-                    >
+                    <section>
                       <div
-                        class="Select__value-container css-319lph-ValueContainer"
+                        class="SubTitle"
                       >
-                        <div
-                          class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-download-mirror-input-placeholder"
-                        >
-                          Download mirror for kubectl
-                        </div>
-                        <div
-                          class="Select__input-container css-jzldcf-Input"
-                          data-value=""
-                        >
-                          <input
-                            aria-autocomplete="list"
-                            aria-describedby="react-select-download-mirror-input-placeholder"
-                            aria-expanded="false"
-                            aria-haspopup="true"
-                            autocapitalize="none"
-                            autocomplete="off"
-                            autocorrect="off"
-                            class="Select__input"
-                            disabled=""
-                            id="download-mirror-input"
-                            role="combobox"
-                            spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                            tabindex="0"
-                            type="text"
-                            value=""
-                          />
-                        </div>
+                        Kubectl binary download
+                         
                       </div>
-                      <div
-                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      <label
+                        class="Switch"
+                        data-testid="switch"
                       >
-                        <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                        Download kubectl binaries matching the Kubernetes cluster version
+                        <input
+                          role="switch"
+                          type="checkbox"
                         />
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="css-tj5bde-Svg"
-                            focusable="false"
-                            height="20"
-                            viewBox="0 0 20 20"
-                            width="20"
-                          >
-                            <path
-                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                            />
-                          </svg>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </section>
-                <section>
-                  <div
-                    class="SubTitle"
-                  >
-                    Directory for binaries
-                     
+                      </label>
+                    </section>
                   </div>
                   <div
-                    class="Input theme round black disabled"
-                  >
-                    <label
-                      class="input-area flex gaps align-center"
-                      id=""
-                    >
-                      <input
-                        class="input box grow"
-                        disabled=""
-                        placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                        spellcheck="false"
-                        value=""
-                      />
-                    </label>
-                    <div
-                      class="input-info flex gaps"
-                    />
-                  </div>
+                    class="size-xl"
+                  />
                   <div
-                    class="hint"
+                    data-preference-item-test="kubectl-download-mirror"
                   >
-                    The directory to download binaries into.
-                  </div>
-                </section>
-                <section>
-                  <div
-                    class="SubTitle"
-                  >
-                    Path to kubectl binary
-                     
-                  </div>
-                  <div
-                    class="Input theme round black"
-                  >
-                    <label
-                      class="input-area flex gaps align-center"
-                      id=""
-                    >
-                      <input
-                        class="input box grow"
-                        placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                        spellcheck="false"
-                        value=""
-                      />
-                    </label>
-                    <div
-                      class="input-info flex gaps"
-                    />
-                  </div>
-                </section>
-              </section>
-              <hr />
-              <section
-                id="kube-sync"
-              >
-                <h2
-                  data-testid="kubernetes-sync-header"
-                >
-                  Kubeconfig Syncs
-                </h2>
-                <div
-                  class="self-start mb-5"
-                >
-                  <button
-                    class="Button PathPicker primary"
-                    type="button"
-                  >
-                    Sync Files and Folders
-                  </button>
-                </div>
-                <div
-                  class="SubTitle pt-5"
-                >
-                  Synced Items
-                   
-                </div>
-                <div
-                  class="notice mt-3"
-                >
-                  <div
-                    class="flex-grow text-center"
-                  >
-                    No files and folders have been synced yet
-                  </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="helm"
-              >
-                <h2>
-                  Helm Charts
-                </h2>
-                <div>
-                  <div
-                    data-testid="helm-controls"
-                  >
-                    <div
-                      class="flex gaps"
-                    >
+                    <section>
                       <div
-                        class="Select theme-lens box grow css-b62m3t-container"
+                        class="SubTitle"
+                      >
+                        Download mirror
+                         
+                      </div>
+                      <div
+                        class="Select theme-lens Select--is-disabled css-3iigni-container"
                       >
                         <span
                           class="css-1f43avz-a11yText-A11yText"
-                          id="react-select-selection-of-active-public-helm-repository-live-region"
+                          id="react-select-download-mirror-input-live-region"
                         />
                         <span
                           aria-atomic="false"
@@ -1014,31 +916,32 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
                           class="css-1f43avz-a11yText-A11yText"
                         />
                         <div
-                          class="Select__control css-1s2u09g-control"
+                          class="Select__control Select__control--is-disabled css-1insrsq-control"
                         >
                           <div
                             class="Select__value-container css-319lph-ValueContainer"
                           >
                             <div
                               class="Select__placeholder css-14el2xx-placeholder"
-                              id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              id="react-select-download-mirror-input-placeholder"
                             >
-                              Repositories
+                              Download mirror for kubectl
                             </div>
                             <div
-                              class="Select__input-container css-6j8wv5-Input"
+                              class="Select__input-container css-jzldcf-Input"
                               data-value=""
                             >
                               <input
                                 aria-autocomplete="list"
-                                aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                aria-describedby="react-select-download-mirror-input-placeholder"
                                 aria-expanded="false"
                                 aria-haspopup="true"
                                 autocapitalize="none"
                                 autocomplete="off"
                                 autocorrect="off"
                                 class="Select__input"
-                                id="selection-of-active-public-helm-repository"
+                                disabled=""
+                                id="download-mirror-input"
                                 role="combobox"
                                 spellcheck="false"
                                 style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1052,7 +955,7 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
                             class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                           >
                             <span
-                              class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              class="Select__indicator-separator css-109onse-indicatorSeparator"
                             />
                             <div
                               aria-hidden="true"
@@ -1074,21 +977,232 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
                           </div>
                         </div>
                       </div>
-                      <button
-                        class="Button primary"
-                        data-testid="add-custom-helm-repo-button"
-                        type="button"
-                      >
-                        Add Custom Helm Repo
-                      </button>
-                    </div>
-                    <div
-                      class="repos"
-                    />
-                    <div />
+                    </section>
                   </div>
-                </div>
-              </section>
+                  <div
+                    class="size-xl"
+                  />
+                  <div
+                    data-preference-item-test="kubectl-directory-for-binaries"
+                  >
+                    <section>
+                      <div
+                        class="SubTitle"
+                      >
+                        Directory for binaries
+                         
+                      </div>
+                      <div
+                        class="Input theme round black disabled"
+                      >
+                        <label
+                          class="input-area flex gaps align-center"
+                          id=""
+                        >
+                          <input
+                            class="input box grow"
+                            disabled=""
+                            placeholder="/some-electron-app-path-for-user-data/binaries"
+                            spellcheck="false"
+                            value=""
+                          />
+                        </label>
+                        <div
+                          class="input-info flex gaps"
+                        />
+                      </div>
+                      <div
+                        class="hint"
+                      >
+                        The directory to download binaries into.
+                      </div>
+                    </section>
+                  </div>
+                  <div
+                    class="size-xl"
+                  />
+                  <div
+                    data-preference-item-test="kubectl-path-to-binary"
+                  >
+                    <section>
+                      <div
+                        class="SubTitle"
+                      >
+                        Path to kubectl binary
+                         
+                      </div>
+                      <div
+                        class="Input theme round black"
+                      >
+                        <label
+                          class="input-area flex gaps align-center"
+                          id=""
+                        >
+                          <input
+                            class="input box grow"
+                            placeholder="/some-electron-app-path-for-user-data/binaries/kubectl"
+                            spellcheck="false"
+                            value=""
+                          />
+                        </label>
+                        <div
+                          class="input-info flex gaps"
+                        />
+                      </div>
+                    </section>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="kubeconfig-sync"
+              >
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
+                    <button
+                      class="Button PathPicker primary"
+                      type="button"
+                    >
+                      Sync Files and Folders
+                    </button>
+                  </div>
+                  <div
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
+                  >
+                    <div
+                      class="flex-grow text-center"
+                    >
+                      No files and folders have been synced yet
+                    </div>
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="helm-charts"
+              >
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      />
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -1173,6 +1287,7 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
index 51502f3bd3..6661463ff4 100644
--- a/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
@@ -11,44 +11,62 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -56,7 +74,6 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -68,68 +85,72 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
             </div>
@@ -143,400 +164,429 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
             class="content"
           >
             <section
-              id="application"
+              data-preference-page-test="application-page"
+              id="application-page"
             >
               <h2
-                data-testid="application-header"
+                data-preference-page-title-test="true"
               >
                 Application
               </h2>
-              <section
-                id="appearance"
+              <div
+                data-preference-item-test="theme"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="appearance"
                 >
-                  Theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-theme-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="extensionRegistryUrl"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="extensionRegistryUrl"
                 >
-                  Extension Install Registry
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-extension-install-registry-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-extension-install-registry-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-extension-install-registry-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="extension-install-registry-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <p
-                  class="mt-4 mb-5 leading-relaxed"
-                >
-                  This setting is to change the registry URL for installing extensions by name. 
-                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                  <b>
-                    .npmrc
-                  </b>
-                   file or in the input below.
-                </p>
-                <div
-                  class="Input theme round black disabled invalid"
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
                 >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
                   <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="Switch"
+                    data-testid="switch"
                   >
+                    Automatically start Lens on login
                     <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="Custom Extension Registry URL..."
-                      spellcheck="false"
-                      value="some-custom-url"
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <hr />
-              <section
-                id="other"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="update-channel"
                 >
-                  Start-up
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Automatically start Lens on login
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <hr />
-              <section
-                id="update-channel"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Update Channel
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-update-channel-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__single-value css-qc6sy-singleValue"
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                       >
-                        Stable
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="update-channel-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="locale"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="locale"
                 >
-                  Locale Timezone
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-timezone-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-timezone-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-timezone-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="timezone-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -621,6 +671,7 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -649,44 +700,62 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -694,7 +763,6 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="proxy-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -706,68 +774,72 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
             </div>
@@ -781,76 +853,81 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
             class="content"
           >
             <section
-              id="proxy"
+              data-preference-page-test="proxy-page"
+              id="proxy-page"
             >
-              <section>
-                <h2
-                  data-testid="proxy-header"
-                >
-                  Proxy
-                </h2>
-                <div
-                  class="SubTitle"
-                >
-                  HTTP Proxy
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+              <h2
+                data-preference-page-title-test="true"
+              >
+                Proxy
+              </h2>
+              <div
+                data-preference-item-test="http-proxy-url"
+              >
+                <section>
+                  <div
+                    class="SubTitle"
                   >
+                    HTTP Proxy
+                     
+                  </div>
+                  <div
+                    class="Input theme round black"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        placeholder="Type HTTP proxy url (example: http://proxy.acme.org:8080)"
+                        spellcheck="false"
+                        value=""
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                  <small
+                    class="hint"
+                  >
+                    Proxy is used only for non-cluster communication.
+                  </small>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-sm"
+              />
+              <div
+                data-preference-item-test="allow-untrusted-certificates"
+              >
+                <section
+                  class="small"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Certificate Trust
+                     
+                  </div>
+                  <label
+                    class="Switch"
+                    data-testid="switch"
+                  >
+                    Allow untrusted Certificate Authorities
                     <input
-                      class="input box grow"
-                      placeholder="Type HTTP proxy url (example: http://proxy.acme.org:8080)"
-                      spellcheck="false"
-                      value=""
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <small
-                  class="hint"
-                >
-                  Proxy is used only for non-cluster communication.
-                </small>
-              </section>
-              <hr
-                class="small"
-              />
-              <section
-                class="small"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Certificate Trust
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Allow untrusted Certificate Authorities
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-                <small
-                  class="hint"
-                >
-                  This will make Lens to trust ANY certificate authority without any validations.
-                   
-                  Needed with some corporate proxies that do certificate re-writing.
-                   
-                  Does not affect cluster communications!
-                </small>
-              </section>
+                  <small
+                    class="hint"
+                  >
+                    This will make Lens to trust ANY certificate authority without any validations. Needed with some corporate proxies that do certificate re-writing. Does not affect cluster communications!
+                  </small>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -935,6 +1012,7 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
index d0bfd5cbd0..3db1201033 100644
--- a/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
@@ -11,44 +11,62 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -56,7 +74,6 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="telemetry-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -68,80 +85,84 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-telemetry"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Telemetry
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="telemetry"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Telemetry
+                  </div>
                 </div>
               </div>
             </div>
@@ -155,50 +176,52 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
             class="content"
           >
             <section
-              id="telemetry"
+              data-preference-page-test="telemetry-page"
+              id="telemetry-page"
             >
               <h2
-                data-testid="telemetry-header"
+                data-preference-page-title-test="true"
               >
                 Telemetry
               </h2>
-              <section
-                class="small"
-                data-testid="telemetry-preferences-for-automatic-error-reporting"
-                id="sentry"
+              <div
+                data-preference-item-test="automatic-error-reporting"
               >
                 <div
-                  class="SubTitle"
+                  class="small"
+                  data-testid="telemetry-preferences-for-automatic-error-reporting"
+                  id="sentry"
                 >
-                  Automatic Error Reporting
-                   
-                </div>
-                <label
-                  class="Checkbox flex align-center"
-                >
-                  <input
-                    type="checkbox"
-                  />
-                  <i
-                    class="box flex align-center"
-                  />
-                  <span
-                    class="label"
+                  <div
+                    class="SubTitle"
                   >
-                    Allow automatic error reporting
-                  </span>
-                </label>
-                <div
-                  class="hint"
-                >
-                  <span>
-                    Automatic error reports provide vital information about issues and application crashes. It is highly recommended to keep this feature enabled to ensure fast turnaround for issues you might encounter.
-                  </span>
+                    Automatic Error Reporting
+                     
+                  </div>
+                  <label
+                    class="Checkbox flex align-center"
+                  >
+                    <input
+                      type="checkbox"
+                    />
+                    <i
+                      class="box flex align-center"
+                    />
+                    <span
+                      class="label"
+                    >
+                      Allow automatic error reporting
+                    </span>
+                  </label>
+                  <div
+                    class="hint"
+                  >
+                    <span>
+                      Automatic error reports provide vital information about issues and application crashes. It is highly recommended to keep this feature enabled to ensure fast turnaround for issues you might encounter.
+                    </span>
+                  </div>
                 </div>
-              </section>
-              <hr
-                class="small"
-              />
+              </div>
             </section>
           </div>
           <div
@@ -283,6 +306,7 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -311,44 +335,62 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -356,7 +398,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -368,68 +409,72 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
             </div>
@@ -443,400 +488,429 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
             class="content"
           >
             <section
-              id="application"
+              data-preference-page-test="application-page"
+              id="application-page"
             >
               <h2
-                data-testid="application-header"
+                data-preference-page-title-test="true"
               >
                 Application
               </h2>
-              <section
-                id="appearance"
+              <div
+                data-preference-item-test="theme"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="appearance"
                 >
-                  Theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-theme-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="extensionRegistryUrl"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="extensionRegistryUrl"
                 >
-                  Extension Install Registry
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-extension-install-registry-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-extension-install-registry-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-extension-install-registry-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="extension-install-registry-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <p
-                  class="mt-4 mb-5 leading-relaxed"
-                >
-                  This setting is to change the registry URL for installing extensions by name. 
-                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                  <b>
-                    .npmrc
-                  </b>
-                   file or in the input below.
-                </p>
-                <div
-                  class="Input theme round black disabled invalid"
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
                 >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
                   <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="Switch"
+                    data-testid="switch"
                   >
+                    Automatically start Lens on login
                     <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="Custom Extension Registry URL..."
-                      spellcheck="false"
-                      value="some-custom-url"
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <hr />
-              <section
-                id="other"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="update-channel"
                 >
-                  Start-up
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Automatically start Lens on login
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <hr />
-              <section
-                id="update-channel"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Update Channel
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-update-channel-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__single-value css-qc6sy-singleValue"
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                       >
-                        Stable
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="update-channel-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="locale"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="locale"
                 >
-                  Locale Timezone
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-timezone-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-timezone-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-timezone-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="timezone-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -921,6 +995,7 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -949,44 +1024,62 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -994,7 +1087,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -1006,80 +1098,84 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-telemetry"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Telemetry
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="telemetry"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Telemetry
+                  </div>
                 </div>
               </div>
             </div>
@@ -1093,400 +1189,429 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
             class="content"
           >
             <section
-              id="application"
+              data-preference-page-test="application-page"
+              id="application-page"
             >
               <h2
-                data-testid="application-header"
+                data-preference-page-title-test="true"
               >
                 Application
               </h2>
-              <section
-                id="appearance"
+              <div
+                data-preference-item-test="theme"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="appearance"
                 >
-                  Theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-theme-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="extensionRegistryUrl"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="extensionRegistryUrl"
                 >
-                  Extension Install Registry
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-extension-install-registry-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-extension-install-registry-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-extension-install-registry-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="extension-install-registry-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <p
-                  class="mt-4 mb-5 leading-relaxed"
-                >
-                  This setting is to change the registry URL for installing extensions by name. 
-                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                  <b>
-                    .npmrc
-                  </b>
-                   file or in the input below.
-                </p>
-                <div
-                  class="Input theme round black disabled invalid"
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
                 >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
                   <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="Switch"
+                    data-testid="switch"
                   >
+                    Automatically start Lens on login
                     <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="Custom Extension Registry URL..."
-                      spellcheck="false"
-                      value="some-custom-url"
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <hr />
-              <section
-                id="other"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="update-channel"
                 >
-                  Start-up
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Automatically start Lens on login
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <hr />
-              <section
-                id="update-channel"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Update Channel
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-update-channel-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__single-value css-qc6sy-singleValue"
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                       >
-                        Stable
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="update-channel-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="locale"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="locale"
                 >
-                  Locale Timezone
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-timezone-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-timezone-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-timezone-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="timezone-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -1571,6 +1696,7 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1599,44 +1725,62 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -1644,7 +1788,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="telemetry-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -1656,80 +1799,84 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-telemetry"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Telemetry
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="telemetry"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Telemetry
+                  </div>
                 </div>
               </div>
             </div>
@@ -1743,38 +1890,42 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
             class="content"
           >
             <section
-              id="telemetry"
+              data-preference-page-test="telemetry-page"
+              id="telemetry-page"
             >
               <h2
-                data-testid="telemetry-header"
+                data-preference-page-title-test="true"
               >
                 Telemetry
               </h2>
-              <section
-                class="small"
-                data-testid="telemetry-preference-item-for-some-telemetry-preference-item-id"
-                id="some-telemetry-preference-item-id"
+              <div
+                data-preference-item-test="preference-item-for-extension-some-test-extension-name-item-some-telemetry-preference-item-id"
               >
-                <div
-                  class="SubTitle"
-                >
-                  Some telemetry-preference item
-                   
-                </div>
-                <div
-                  data-testid="some-preference-item-input"
-                />
-                <div
-                  class="hint"
+                <section
+                  class="small"
+                  id="some-telemetry-preference-item-id"
                 >
                   <div
-                    data-testid="some-preference-item-hint"
+                    class="SubTitle"
+                  >
+                    Some telemetry-preference item
+                     
+                  </div>
+                  <div
+                    data-testid="some-preference-item-input"
                   />
-                </div>
-              </section>
-              <hr
-                class="small"
-              />
+                  <div
+                    class="hint"
+                  >
+                    <div
+                      data-testid="some-preference-item-hint"
+                    />
+                  </div>
+                </section>
+                <hr
+                  class="small"
+                />
+              </div>
             </section>
           </div>
           <div
@@ -1859,6 +2010,7 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -1887,44 +2039,62 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -1932,7 +2102,6 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="telemetry-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -1944,68 +2113,72 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
             </div>
@@ -2019,10 +2192,11 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
             class="content"
           >
             <section
-              id="telemetry"
+              data-preference-page-test="telemetry-page"
+              id="telemetry-page"
             >
               <h2
-                data-testid="telemetry-header"
+                data-preference-page-title-test="true"
               >
                 Telemetry
               </h2>
@@ -2110,6 +2284,7 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
index 5286eeb983..3af3331e05 100644
--- a/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
@@ -11,44 +11,62 @@ exports[`preferences - navigation to terminal preferences given in preferences,
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -56,7 +74,6 @@ exports[`preferences - navigation to terminal preferences given in preferences,
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -68,68 +85,72 @@ exports[`preferences - navigation to terminal preferences given in preferences,
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
             </div>
@@ -143,400 +164,429 @@ exports[`preferences - navigation to terminal preferences given in preferences,
             class="content"
           >
             <section
-              id="application"
+              data-preference-page-test="application-page"
+              id="application-page"
             >
               <h2
-                data-testid="application-header"
+                data-preference-page-title-test="true"
               >
                 Application
               </h2>
-              <section
-                id="appearance"
+              <div
+                data-preference-item-test="theme"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="appearance"
                 >
-                  Theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-theme-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="extensionRegistryUrl"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="extensionRegistryUrl"
                 >
-                  Extension Install Registry
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-extension-install-registry-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-extension-install-registry-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-extension-install-registry-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="extension-install-registry-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <p
-                  class="mt-4 mb-5 leading-relaxed"
-                >
-                  This setting is to change the registry URL for installing extensions by name. 
-                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                  <b>
-                    .npmrc
-                  </b>
-                   file or in the input below.
-                </p>
-                <div
-                  class="Input theme round black disabled invalid"
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
                 >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
                   <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="Switch"
+                    data-testid="switch"
                   >
+                    Automatically start Lens on login
                     <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="Custom Extension Registry URL..."
-                      spellcheck="false"
-                      value="some-custom-url"
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <hr />
-              <section
-                id="other"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="update-channel"
                 >
-                  Start-up
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Automatically start Lens on login
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <hr />
-              <section
-                id="update-channel"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Update Channel
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-update-channel-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__single-value css-qc6sy-singleValue"
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                       >
-                        Stable
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="update-channel-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="locale"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="locale"
                 >
-                  Locale Timezone
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-timezone-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-timezone-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-timezone-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="timezone-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -621,6 +671,7 @@ exports[`preferences - navigation to terminal preferences given in preferences,
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -649,44 +700,62 @@ exports[`preferences - navigation to terminal preferences given in preferences,
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -694,7 +763,6 @@ exports[`preferences - navigation to terminal preferences given in preferences,
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="terminal-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -706,68 +774,72 @@ exports[`preferences - navigation to terminal preferences given in preferences,
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
             </div>
@@ -780,252 +852,289 @@ exports[`preferences - navigation to terminal preferences given in preferences,
           <div
             class="content"
           >
-            <section>
-              <h2>
+            <section
+              data-preference-page-test="terminal-page"
+              id="terminal-page"
+            >
+              <h2
+                data-preference-page-title-test="true"
+              >
                 Terminal
               </h2>
-              <section
-                id="shell"
+              <div
+                data-preference-item-test="terminal-shell-path"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="shell"
                 >
-                  Terminal Shell Path
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                  <div
+                    class="SubTitle"
                   >
+                    Terminal Shell Path
+                     
+                  </div>
+                  <div
+                    class="Input theme round black"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        placeholder="some-default-shell"
+                        spellcheck="false"
+                        value=""
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="size-xl"
+              />
+              <div
+                data-preference-item-test="copy-paste-from-terminal-preference-item"
+              >
+                <section
+                  id="terminalSelection"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Terminal copy & paste
+                     
+                  </div>
+                  <label
+                    class="Switch"
+                    data-testid="switch"
+                  >
+                    Copy on select and paste on right-click
                     <input
-                      class="input box grow"
-                      placeholder="some-default-shell"
-                      spellcheck="false"
-                      value=""
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <section
-                id="terminalSelection"
+                </section>
+              </div>
+              <div
+                class="size-xl"
+              />
+              <div
+                data-preference-item-test="terminal-theme"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="terminalTheme"
                 >
-                  Terminal copy & paste
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Copy on select and paste on right-click
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section
-                id="terminalTheme"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Terminal theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-terminal-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Terminal theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-terminal-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-terminal-theme-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-terminal-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="terminal-theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-terminal-theme-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-terminal-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="terminal-theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Font size
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      max="50"
-                      min="10"
-                      spellcheck="false"
-                      type="number"
-                      value="42"
-                    />
-                  </label>
+                </section>
+              </div>
+              <div
+                class="size-xl"
+              />
+              <div
+                data-preference-item-test="terminal-font-size-preference-item"
+              >
+                <section>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Font family
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-2-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                    Font size
+                     
+                  </div>
+                  <div
+                    class="Input theme round black"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
                     >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-2-placeholder"
-                      >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-2-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="react-select-2-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      <input
+                        class="input box grow"
+                        max="50"
+                        min="10"
+                        spellcheck="false"
+                        type="number"
+                        value="42"
                       />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="size-xl"
+              />
+              <div
+                data-preference-item-test="terminal-font-family-preference-item"
+              >
+                <section>
+                  <div
+                    class="SubTitle"
+                  >
+                    Font family
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-2-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
                       <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-2-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-2-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="react-select-2-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -1110,6 +1219,7 @@ exports[`preferences - navigation to terminal preferences given in preferences,
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
index ddde0b5255..815796b7cc 100644
--- a/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -11,44 +11,61 @@ exports[`preferences - navigation using application menu renders 1`] = `
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="home-button"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -77,7 +94,7 @@ exports[`preferences - navigation using application menu renders 1`] = `
               style="width: 320px;"
             >
               <h2>
-                Welcome to OpenLens!
+                Welcome to some-product-name!
               </h2>
               <p>
                 To get you started we have auto-detected your clusters in your
@@ -183,6 +200,7 @@ exports[`preferences - navigation using application menu renders 1`] = `
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -211,44 +229,62 @@ exports[`preferences - navigation using application menu when navigating to pref
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -256,7 +292,6 @@ exports[`preferences - navigation using application menu when navigating to pref
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -268,68 +303,72 @@ exports[`preferences - navigation using application menu when navigating to pref
               class="Tabs flex column"
             >
               <div
-                class="header"
-              >
-                Preferences
-              </div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-application"
-                role="tab"
-                tabindex="0"
+                data-preference-tab-group-test="general-tab-group"
               >
                 <div
-                  class="label"
+                  class="header flex items-center"
                 >
-                  App
+                  Preferences
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-proxy"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center active"
+                  data-preference-tab-link-test="app"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Proxy
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-kubernetes"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Kubernetes
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-editor"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="kubernetes"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Editor
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
                 </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-terminal"
-                role="tab"
-                tabindex="0"
-              >
                 <div
-                  class="label"
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="editor"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Terminal
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-preference-tab-link-test="terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
                 </div>
               </div>
             </div>
@@ -343,400 +382,429 @@ exports[`preferences - navigation using application menu when navigating to pref
             class="content"
           >
             <section
-              id="application"
+              data-preference-page-test="application-page"
+              id="application-page"
             >
               <h2
-                data-testid="application-header"
+                data-preference-page-title-test="true"
               >
                 Application
               </h2>
-              <section
-                id="appearance"
+              <div
+                data-preference-item-test="theme"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="appearance"
                 >
-                  Theme
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-theme-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-theme-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-theme-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="theme-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="extensionRegistryUrl"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="extension-install-registry"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="extensionRegistryUrl"
                 >
-                  Extension Install Registry
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-extension-install-registry-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-extension-install-registry-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-extension-install-registry-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="extension-install-registry-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <p
-                  class="mt-4 mb-5 leading-relaxed"
-                >
-                  This setting is to change the registry URL for installing extensions by name. 
-                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                  <b>
-                    .npmrc
-                  </b>
-                   file or in the input below.
-                </p>
-                <div
-                  class="Input theme round black disabled invalid"
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="start-up"
+              >
+                <section
+                  id="other"
                 >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
                   <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="Switch"
+                    data-testid="switch"
                   >
+                    Automatically start Lens on login
                     <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="Custom Extension Registry URL..."
-                      spellcheck="false"
-                      value="some-custom-url"
+                      role="switch"
+                      type="checkbox"
                     />
                   </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-              <hr />
-              <section
-                id="other"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="update-channel"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="update-channel"
                 >
-                  Start-up
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Automatically start Lens on login
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <hr />
-              <section
-                id="update-channel"
-              >
-                <div
-                  class="SubTitle"
-                >
-                  Update Channel
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-update-channel-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__single-value css-qc6sy-singleValue"
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                       >
-                        Stable
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="update-channel-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
-              <hr />
-              <section
-                id="locale"
+                </section>
+              </div>
+              <div
+                class="HorizontalLine size-xl"
+              />
+              <div
+                data-preference-item-test="timezone"
               >
-                <div
-                  class="SubTitle"
+                <section
+                  id="locale"
                 >
-                  Locale Timezone
-                   
-                </div>
-                <div
-                  class="Select theme-lens css-b62m3t-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-timezone-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control css-1s2u09g-control"
+                    class="SubTitle"
                   >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-timezone-input-placeholder"
+                        class="Select__value-container css-319lph-ValueContainer"
                       >
-                        Select...
-                      </div>
-                      <div
-                        class="Select__input-container css-6j8wv5-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-timezone-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          id="timezone-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
                           />
-                        </svg>
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
                       </div>
                     </div>
                   </div>
-                </div>
-              </section>
+                </section>
+              </div>
             </section>
           </div>
           <div
@@ -821,6 +889,7 @@ exports[`preferences - navigation using application menu when navigating to pref
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap b/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap
index 5f4148f251..731137c5e4 100644
--- a/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap
@@ -12,44 +12,61 @@ exports[`show-about-using-tray renders 1`] = `
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -78,7 +95,7 @@ exports[`show-about-using-tray renders 1`] = `
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -184,6 +201,7 @@ exports[`show-about-using-tray renders 1`] = `
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -214,44 +232,62 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -259,7 +295,6 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="application-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -271,68 +306,72 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -346,400 +385,429 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
               class="content"
             >
               <section
-                id="application"
+                data-preference-page-test="application-page"
+                id="application-page"
               >
                 <h2
-                  data-testid="application-header"
+                  data-preference-page-title-test="true"
                 >
                   Application
                 </h2>
-                <section
-                  id="appearance"
+                <div
+                  data-preference-item-test="theme"
                 >
-                  <div
-                    class="SubTitle"
+                  <section
+                    id="appearance"
                   >
-                    Theme
-                     
-                  </div>
-                  <div
-                    class="Select theme-lens css-b62m3t-container"
-                  >
-                    <span
-                      class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-theme-input-live-region"
-                    />
-                    <span
-                      aria-atomic="false"
-                      aria-live="polite"
-                      aria-relevant="additions text"
-                      class="css-1f43avz-a11yText-A11yText"
-                    />
                     <div
-                      class="Select__control css-1s2u09g-control"
+                      class="SubTitle"
                     >
+                      Theme
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-theme-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
                       <div
-                        class="Select__value-container css-319lph-ValueContainer"
+                        class="Select__control css-1s2u09g-control"
                       >
                         <div
-                          class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-theme-input-placeholder"
+                          class="Select__value-container css-319lph-ValueContainer"
                         >
-                          Select...
-                        </div>
-                        <div
-                          class="Select__input-container css-6j8wv5-Input"
-                          data-value=""
-                        >
-                          <input
-                            aria-autocomplete="list"
-                            aria-describedby="react-select-theme-input-placeholder"
-                            aria-expanded="false"
-                            aria-haspopup="true"
-                            autocapitalize="none"
-                            autocomplete="off"
-                            autocorrect="off"
-                            class="Select__input"
-                            id="theme-input"
-                            role="combobox"
-                            spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                            tabindex="0"
-                            type="text"
-                            value=""
-                          />
-                        </div>
-                      </div>
-                      <div
-                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                      >
-                        <span
-                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                        />
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="css-tj5bde-Svg"
-                            focusable="false"
-                            height="20"
-                            viewBox="0 0 20 20"
-                            width="20"
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-theme-input-placeholder"
                           >
-                            <path
-                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-theme-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="theme-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
                             />
-                          </svg>
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="extensionRegistryUrl"
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="extension-install-registry"
                 >
-                  <div
-                    class="SubTitle"
+                  <section
+                    id="extensionRegistryUrl"
                   >
-                    Extension Install Registry
-                     
-                  </div>
-                  <div
-                    class="Select theme-lens css-b62m3t-container"
-                  >
-                    <span
-                      class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-extension-install-registry-input-live-region"
-                    />
-                    <span
-                      aria-atomic="false"
-                      aria-live="polite"
-                      aria-relevant="additions text"
-                      class="css-1f43avz-a11yText-A11yText"
-                    />
                     <div
-                      class="Select__control css-1s2u09g-control"
+                      class="SubTitle"
                     >
+                      Extension Install Registry
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-extension-install-registry-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
                       <div
-                        class="Select__value-container css-319lph-ValueContainer"
+                        class="Select__control css-1s2u09g-control"
                       >
                         <div
-                          class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-extension-install-registry-input-placeholder"
+                          class="Select__value-container css-319lph-ValueContainer"
                         >
-                          Select...
-                        </div>
-                        <div
-                          class="Select__input-container css-6j8wv5-Input"
-                          data-value=""
-                        >
-                          <input
-                            aria-autocomplete="list"
-                            aria-describedby="react-select-extension-install-registry-input-placeholder"
-                            aria-expanded="false"
-                            aria-haspopup="true"
-                            autocapitalize="none"
-                            autocomplete="off"
-                            autocorrect="off"
-                            class="Select__input"
-                            id="extension-install-registry-input"
-                            role="combobox"
-                            spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                            tabindex="0"
-                            type="text"
-                            value=""
-                          />
-                        </div>
-                      </div>
-                      <div
-                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                      >
-                        <span
-                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                        />
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="css-tj5bde-Svg"
-                            focusable="false"
-                            height="20"
-                            viewBox="0 0 20 20"
-                            width="20"
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-extension-install-registry-input-placeholder"
                           >
-                            <path
-                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-extension-install-registry-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="extension-install-registry-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
                             />
-                          </svg>
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                  <p
-                    class="mt-4 mb-5 leading-relaxed"
-                  >
-                    This setting is to change the registry URL for installing extensions by name. 
-                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                    <b>
-                      .npmrc
-                    </b>
-                     file or in the input below.
-                  </p>
-                  <div
-                    class="Input theme round black disabled invalid"
+                    <p
+                      class="mt-4 mb-5 leading-relaxed"
+                    >
+                      This setting is to change the registry URL for installing extensions by name. 
+                      If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                      <b>
+                        .npmrc
+                      </b>
+                       file or in the input below.
+                    </p>
+                    <div
+                      class="Input theme round black disabled invalid"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="Custom Extension Registry URL..."
+                          spellcheck="false"
+                          value="some-custom-url"
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="start-up"
+                >
+                  <section
+                    id="other"
                   >
+                    <div
+                      class="SubTitle"
+                    >
+                      Start-up
+                       
+                    </div>
                     <label
-                      class="input-area flex gaps align-center"
-                      id=""
+                      class="Switch"
+                      data-testid="switch"
                     >
+                      Automatically start Lens on login
                       <input
-                        class="input box grow"
-                        disabled=""
-                        placeholder="Custom Extension Registry URL..."
-                        spellcheck="false"
-                        value="some-custom-url"
+                        role="switch"
+                        type="checkbox"
                       />
                     </label>
-                    <div
-                      class="input-info flex gaps"
-                    />
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="other"
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="update-channel"
                 >
-                  <div
-                    class="SubTitle"
+                  <section
+                    id="update-channel"
                   >
-                    Start-up
-                     
-                  </div>
-                  <label
-                    class="Switch"
-                    data-testid="switch"
-                  >
-                    Automatically start Lens on login
-                    <input
-                      role="switch"
-                      type="checkbox"
-                    />
-                  </label>
-                </section>
-                <hr />
-                <section
-                  id="update-channel"
-                >
-                  <div
-                    class="SubTitle"
-                  >
-                    Update Channel
-                     
-                  </div>
-                  <div
-                    class="Select theme-lens css-b62m3t-container"
-                  >
-                    <span
-                      class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-update-channel-input-live-region"
-                    />
-                    <span
-                      aria-atomic="false"
-                      aria-live="polite"
-                      aria-relevant="additions text"
-                      class="css-1f43avz-a11yText-A11yText"
-                    />
                     <div
-                      class="Select__control css-1s2u09g-control"
+                      class="SubTitle"
                     >
+                      Update Channel
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-update-channel-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
                       <div
-                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                        class="Select__control css-1s2u09g-control"
                       >
                         <div
-                          class="Select__single-value css-qc6sy-singleValue"
+                          class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                         >
-                          Stable
-                        </div>
-                        <div
-                          class="Select__input-container css-6j8wv5-Input"
-                          data-value=""
-                        >
-                          <input
-                            aria-autocomplete="list"
-                            aria-expanded="false"
-                            aria-haspopup="true"
-                            autocapitalize="none"
-                            autocomplete="off"
-                            autocorrect="off"
-                            class="Select__input"
-                            id="update-channel-input"
-                            role="combobox"
-                            spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                            tabindex="0"
-                            type="text"
-                            value=""
-                          />
-                        </div>
-                      </div>
-                      <div
-                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                      >
-                        <span
-                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                        />
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="css-tj5bde-Svg"
-                            focusable="false"
-                            height="20"
-                            viewBox="0 0 20 20"
-                            width="20"
+                          <div
+                            class="Select__single-value css-qc6sy-singleValue"
                           >
-                            <path
-                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            Stable
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="update-channel-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
                             />
-                          </svg>
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="locale"
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="timezone"
                 >
-                  <div
-                    class="SubTitle"
+                  <section
+                    id="locale"
                   >
-                    Locale Timezone
-                     
-                  </div>
-                  <div
-                    class="Select theme-lens css-b62m3t-container"
-                  >
-                    <span
-                      class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-timezone-input-live-region"
-                    />
-                    <span
-                      aria-atomic="false"
-                      aria-live="polite"
-                      aria-relevant="additions text"
-                      class="css-1f43avz-a11yText-A11yText"
-                    />
                     <div
-                      class="Select__control css-1s2u09g-control"
+                      class="SubTitle"
                     >
+                      Locale Timezone
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-timezone-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
                       <div
-                        class="Select__value-container css-319lph-ValueContainer"
+                        class="Select__control css-1s2u09g-control"
                       >
                         <div
-                          class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-timezone-input-placeholder"
+                          class="Select__value-container css-319lph-ValueContainer"
                         >
-                          Select...
-                        </div>
-                        <div
-                          class="Select__input-container css-6j8wv5-Input"
-                          data-value=""
-                        >
-                          <input
-                            aria-autocomplete="list"
-                            aria-describedby="react-select-timezone-input-placeholder"
-                            aria-expanded="false"
-                            aria-haspopup="true"
-                            autocapitalize="none"
-                            autocomplete="off"
-                            autocorrect="off"
-                            class="Select__input"
-                            id="timezone-input"
-                            role="combobox"
-                            spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                            tabindex="0"
-                            type="text"
-                            value=""
-                          />
-                        </div>
-                      </div>
-                      <div
-                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                      >
-                        <span
-                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                        />
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="css-tj5bde-Svg"
-                            focusable="false"
-                            height="20"
-                            viewBox="0 0 20 20"
-                            width="20"
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-timezone-input-placeholder"
                           >
-                            <path
-                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-timezone-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="timezone-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
                             />
-                          </svg>
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -824,6 +892,7 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
diff --git a/src/features/preferences/__snapshots__/urls-of-legacy-extensions.test.tsx.snap b/src/features/preferences/__snapshots__/urls-of-legacy-extensions.test.tsx.snap
new file mode 100644
index 0000000000..05e451bf27
--- /dev/null
+++ b/src/features/preferences/__snapshots__/urls-of-legacy-extensions.test.tsx.snap
@@ -0,0 +1,1695 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`preferences: URLs of legacy extensions given extension with both custom preference tabs and content for the default tab when navigating to specific custom preference tab using magic string URL renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  data-preference-tab-group-test="general-tab-group"
+                >
+                  <div
+                    class="header flex items-center"
+                  >
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="extension-some-extension-some-preference-tab-id"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Some title
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="extension-some-extension-some-other-preference-tab-id"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Some other title
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="TabSeparator"
+                >
+                  <div
+                    class="HorizontalLine size-sm"
+                  />
+                </div>
+                <div
+                  data-preference-tab-group-test="extensions-tab-group"
+                >
+                  <div
+                    class="header flex items-center"
+                  >
+                    <i
+                      class="Icon mr-3 material focusable smallest"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="extension"
+                      >
+                        extension
+                      </span>
+                    </i>
+                    Extensions
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="some-extension"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      some-extension
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                data-preference-page-test="preference-item-for-extension-some-extension-additional-page-some-preference-tab-id"
+                id="preference-item-for-extension-some-extension-additional-page-some-preference-tab-id"
+              >
+                <h2
+                  data-preference-page-title-test="true"
+                >
+                  Some title
+                </h2>
+                <div
+                  data-preference-item-test="preference-item-for-extension-some-extension-item-some-preference-item-id"
+                >
+                  <section
+                    class="small"
+                    id="some-preference-item-id"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      some-title
+                       
+                    </div>
+                    <div
+                      data-some-preference-test="some-preference-in-custom-tab"
+                    />
+                    <div
+                      class="hint"
+                    >
+                      <div />
+                    </div>
+                  </section>
+                  <hr
+                    class="small"
+                  />
+                </div>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
+
+exports[`preferences: URLs of legacy extensions given extension with both custom preference tabs and content for the default tab when navigating to unspecified custom preferences tab using magic string URL renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  data-preference-tab-group-test="general-tab-group"
+                >
+                  <div
+                    class="header flex items-center"
+                  >
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="extension-some-extension-some-preference-tab-id"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Some title
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="extension-some-extension-some-other-preference-tab-id"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Some other title
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="TabSeparator"
+                >
+                  <div
+                    class="HorizontalLine size-sm"
+                  />
+                </div>
+                <div
+                  data-preference-tab-group-test="extensions-tab-group"
+                >
+                  <div
+                    class="header flex items-center"
+                  >
+                    <i
+                      class="Icon mr-3 material focusable smallest"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="extension"
+                      >
+                        extension
+                      </span>
+                    </i>
+                    Extensions
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="some-extension"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      some-extension
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                data-preference-page-test="preference-item-for-extension-some-extension-page"
+                id="preference-item-for-extension-some-extension-page"
+              >
+                <h2
+                  data-preference-page-title-test="true"
+                >
+                  some-extension preferences
+                </h2>
+                <div
+                  data-preference-item-test="preference-item-for-extension-some-extension-item-some-preference-item-id-in-default-tab"
+                >
+                  <section
+                    class="small"
+                    id="some-preference-item-id-in-default-tab"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      some-title-in-default-tab
+                       
+                    </div>
+                    <div
+                      data-some-preference-test="some-preference-in-default-tab"
+                    />
+                    <div
+                      class="hint"
+                    >
+                      <div />
+                    </div>
+                  </section>
+                  <hr
+                    class="small"
+                  />
+                </div>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
+
+exports[`preferences: URLs of legacy extensions given extension with custom preferences and a custom preference tab when navigating to specific custom preference tab using magic string URL renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  data-preference-tab-group-test="general-tab-group"
+                >
+                  <div
+                    class="header flex items-center"
+                  >
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="extension-some-extension-some-preference-tab-id"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Some title
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="extension-some-extension-some-other-preference-tab-id"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Some other title
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                data-preference-page-test="preference-item-for-extension-some-extension-additional-page-some-preference-tab-id"
+                id="preference-item-for-extension-some-extension-additional-page-some-preference-tab-id"
+              >
+                <h2
+                  data-preference-page-title-test="true"
+                >
+                  Some title
+                </h2>
+                <div
+                  data-preference-item-test="preference-item-for-extension-some-extension-item-some-preference-item-id"
+                >
+                  <section
+                    class="small"
+                    id="some-preference-item-id"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      some-title
+                       
+                    </div>
+                    <div
+                      data-some-preference-test="some-preference"
+                    />
+                    <div
+                      class="hint"
+                    >
+                      <div />
+                    </div>
+                  </section>
+                  <hr
+                    class="small"
+                  />
+                </div>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
+
+exports[`preferences: URLs of legacy extensions given extension with custom preferences and a custom preference tab when navigating to unspecified custom preferences tab using magic string URL renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  data-preference-tab-group-test="general-tab-group"
+                >
+                  <div
+                    class="header flex items-center"
+                  >
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="extension-some-extension-some-preference-tab-id"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Some title
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="extension-some-extension-some-other-preference-tab-id"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Some other title
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                data-preference-page-test="preference-item-for-extension-some-extension-page"
+                id="preference-item-for-extension-some-extension-page"
+              >
+                <h2
+                  data-preference-page-title-test="true"
+                >
+                  some-extension preferences
+                </h2>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
+
+exports[`preferences: URLs of legacy extensions given extension with custom preferences but without a custom preference tab when navigating to the default preference tab using magic string URL renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  data-preference-tab-group-test="general-tab-group"
+                >
+                  <div
+                    class="header flex items-center"
+                  >
+                    Preferences
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="TabSeparator"
+                >
+                  <div
+                    class="HorizontalLine size-sm"
+                  />
+                </div>
+                <div
+                  data-preference-tab-group-test="extensions-tab-group"
+                >
+                  <div
+                    class="header flex items-center"
+                  >
+                    <i
+                      class="Icon mr-3 material focusable smallest"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="extension"
+                      >
+                        extension
+                      </span>
+                    </i>
+                    Extensions
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="some-extension"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      some-extension
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                data-preference-page-test="preference-item-for-extension-some-extension-page"
+                id="preference-item-for-extension-some-extension-page"
+              >
+                <h2
+                  data-preference-page-title-test="true"
+                >
+                  some-extension preferences
+                </h2>
+                <div
+                  data-preference-item-test="preference-item-for-extension-some-extension-item-some-preference-item-id"
+                >
+                  <section
+                    class="small"
+                    id="some-preference-item-id"
+                  >
+                    <div
+                      class="SubTitle"
+                    >
+                      some-title
+                       
+                    </div>
+                    <div
+                      data-some-preference-test="true"
+                    />
+                    <div
+                      class="hint"
+                    >
+                      <div />
+                    </div>
+                  </section>
+                  <hr
+                    class="small"
+                  />
+                </div>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
diff --git a/src/features/preferences/child-features/application-menu/main/navigate-to-preferences/navigate-to-preferences-menu-item.injectable.ts b/src/features/preferences/child-features/application-menu/main/navigate-to-preferences/navigate-to-preferences-menu-item.injectable.ts
new file mode 100644
index 0000000000..30687eed55
--- /dev/null
+++ b/src/features/preferences/child-features/application-menu/main/navigate-to-preferences/navigate-to-preferences-menu-item.injectable.ts
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationMenuItemInjectionToken from "../../../../../application-menu/main/menu-items/application-menu-item-injection-token";
+import navigateToPreferencesInjectable from "../../../../common/navigate-to-preferences.injectable";
+import isMacInjectable from "../../../../../../common/vars/is-mac.injectable";
+
+const navigateToPreferencesMenuItemInjectable = getInjectable({
+  id: "navigate-to-preferences-menu-item",
+
+  instantiate: (di) => {
+    const navigateToPreferences = di.inject(navigateToPreferencesInjectable);
+    const isMac = di.inject(isMacInjectable);
+
+    return {
+      kind: "clickable-menu-item" as const,
+      parentId: isMac ? "mac" : "file",
+      id: "navigate-to-preferences",
+      orderNumber: isMac ? 40 : 30,
+      label: "Preferences",
+      keyboardShortcut: isMac ? "CmdOrCtrl+," : "Ctrl+,",
+
+      onClick: () => {
+        navigateToPreferences();
+      },
+    };
+  },
+
+  injectionToken: applicationMenuItemInjectionToken,
+});
+
+export default navigateToPreferencesMenuItemInjectable;
diff --git a/src/main/tray/tray-menu-item/implementations/open-preferences-tray-item.injectable.ts b/src/features/preferences/child-features/tray/main/open-preferences/open-preferences-tray-item.injectable.ts
similarity index 76%
rename from src/main/tray/tray-menu-item/implementations/open-preferences-tray-item.injectable.ts
rename to src/features/preferences/child-features/tray/main/open-preferences/open-preferences-tray-item.injectable.ts
index 8c062f6a29..4d7c6f66ec 100644
--- a/src/main/tray/tray-menu-item/implementations/open-preferences-tray-item.injectable.ts
+++ b/src/features/preferences/child-features/tray/main/open-preferences/open-preferences-tray-item.injectable.ts
@@ -3,12 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { trayMenuItemInjectionToken } from "../tray-menu-item-injection-token";
-import navigateToPreferencesInjectable from "../../../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable";
+import { trayMenuItemInjectionToken } from "../../../../../../main/tray/tray-menu-item/tray-menu-item-injection-token";
+import navigateToPreferencesInjectable from "../../../../common/navigate-to-preferences.injectable";
 import { computed } from "mobx";
-import { withErrorSuppression } from "../../../../common/utils/with-error-suppression/with-error-suppression";
+import { withErrorSuppression } from "../../../../../../common/utils/with-error-suppression/with-error-suppression";
 import { pipeline } from "@ogre-tools/fp";
-import withErrorLoggingInjectable from "../../../../common/utils/with-error-logging/with-error-logging.injectable";
+import withErrorLoggingInjectable from "../../../../../../common/utils/with-error-logging/with-error-logging.injectable";
 
 const openPreferencesTrayItemInjectable = getInjectable({
   id: "open-preferences-tray-item",
diff --git a/src/features/preferences/closing-preferences.test.tsx b/src/features/preferences/closing-preferences.test.tsx
index 5363e6e76f..7f979969aa 100644
--- a/src/features/preferences/closing-preferences.test.tsx
+++ b/src/features/preferences/closing-preferences.test.tsx
@@ -10,18 +10,15 @@ import { getApplicationBuilder } from "../../renderer/components/test-utils/get-
 import currentPathInjectable from "../../renderer/routes/current-path.injectable";
 import { frontEndRouteInjectionToken } from "../../common/front-end-routing/front-end-route-injection-token";
 import { computed, runInAction } from "mobx";
-import { preferenceNavigationItemInjectionToken } from "../../renderer/components/+preferences/preferences-navigation/preference-navigation-items.injectable";
-import routeIsActiveInjectable from "../../renderer/routes/route-is-active.injectable";
-import { Preferences } from "../../renderer/components/+preferences";
 import React from "react";
 import { routeSpecificComponentInjectionToken } from "../../renderer/routes/route-specific-component-injection-token";
 import observableHistoryInjectable from "../../renderer/navigation/observable-history.injectable";
 import { searchParamsOptions } from "../../renderer/navigation";
 import { createMemoryHistory } from "history";
 import { createObservableHistory } from "mobx-observable-history";
-import navigateToPreferenceTabInjectable from "../../renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab.injectable";
 import navigateToFrontPageInjectable from "../../common/front-end-routing/navigate-to-front-page.injectable";
 import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token";
+import { preferenceItemInjectionToken } from "./renderer/preference-items/preference-item-injection-token";
 
 describe("preferences - closing-preferences", () => {
   let builder: ApplicationBuilder;
@@ -31,11 +28,14 @@ describe("preferences - closing-preferences", () => {
 
     builder.beforeWindowStart((windowDi) => {
       runInAction(() => {
-        windowDi.register(testPreferencesRouteInjectable);
-        windowDi.register(testPreferencesRouteComponentInjectable);
-        windowDi.register(testFrontPageRouteInjectable);
-        windowDi.register(testFrontPageRouteComponentInjectable);
-        windowDi.register(testNavigationItemInjectable);
+        windowDi.register(
+          testPreferenceTabInjectable,
+          testPreferenceItemInjectable,
+          testRouteInjectable,
+          testRouteComponentInjectable,
+          testFrontPageRouteInjectable,
+          testFrontPageRouteComponentInjectable,
+        );
       });
 
       windowDi.override(navigateToFrontPageInjectable, (di) => {
@@ -57,7 +57,7 @@ describe("preferences - closing-preferences", () => {
       builder.beforeWindowStart((windowDi) => {
         windowDi.override(observableHistoryInjectable, () => {
           const historyFake = createMemoryHistory({
-            initialEntries: ["/some-test-path"],
+            initialEntries: ["/some-page"],
             initialIndex: 0,
           });
 
@@ -89,14 +89,18 @@ describe("preferences - closing-preferences", () => {
       it("navigates back to the original page", () => {
         const currentPath = windowDi.inject(currentPathInjectable).get();
 
-        expect(currentPath).toBe("/some-test-path");
+        expect(currentPath).toBe("/some-page");
+      });
+
+      it("shows the original page", () => {
+        expect(rendered.getByTestId("some-page")).toBeInTheDocument();
       });
     });
 
     describe("when navigating to a tab in preferences", () => {
       beforeEach(() => {
         builder.preferences.navigation.click(
-          "some-test-preference-navigation-item-id",
+          "some-path-id-for-some-test-tab-id",
         );
       });
 
@@ -116,7 +120,11 @@ describe("preferences - closing-preferences", () => {
         it("navigates back to the original page", () => {
           const currentPath = windowDi.inject(currentPathInjectable).get();
 
-          expect(currentPath).toBe("/some-test-path");
+          expect(currentPath).toBe("/some-page");
+        });
+
+        it("shows the original page", () => {
+          expect(rendered.getByTestId("some-page")).toBeInTheDocument();
         });
       });
     });
@@ -163,12 +171,16 @@ describe("preferences - closing-preferences", () => {
 
         expect(currentPath).toBe("/some-front-page");
       });
+
+      it("shows front page", () => {
+        expect(rendered.getByTestId("some-front-page")).toBeInTheDocument();
+      });
     });
 
     describe("when navigating to a tab in preferences", () => {
       beforeEach(() => {
         builder.preferences.navigation.click(
-          "some-test-preference-navigation-item-id",
+          "some-path-id-for-some-test-tab-id",
         );
       });
 
@@ -190,36 +202,17 @@ describe("preferences - closing-preferences", () => {
 
           expect(currentPath).toBe("/some-front-page");
         });
+
+        it("shows front page", () => {
+          expect(rendered.getByTestId("some-front-page")).toBeInTheDocument();
+        });
       });
     });
   });
 });
 
-const testPreferencesRouteInjectable = getInjectable({
-  id: "test-preferences-route",
-
-  instantiate: () => ({
-    path: "/some-test-path",
-    clusterFrame: false,
-    isEnabled: computed(() => true),
-  }),
-
-  injectionToken: frontEndRouteInjectionToken,
-});
-
-const testPreferencesRouteComponentInjectable = getInjectable({
-  id: "test-route-component",
-
-  instantiate: (di) => ({
-    route: di.inject(testPreferencesRouteInjectable),
-    Component: () => <Preferences>Some test page</Preferences>,
-  }),
-
-  injectionToken: routeSpecificComponentInjectionToken,
-});
-
 const testFrontPageRouteInjectable = getInjectable({
-  id: "test-front-page-route",
+  id: "some-front-page",
 
   instantiate: () => ({
     path: "/some-front-page",
@@ -231,34 +224,65 @@ const testFrontPageRouteInjectable = getInjectable({
 });
 
 const testFrontPageRouteComponentInjectable = getInjectable({
-  id: "test-front-page-route-component",
+  id: "some-front-page-component",
 
   instantiate: (di) => ({
     route: di.inject(testFrontPageRouteInjectable),
-    Component: () => <div>Some front page</div>,
+    Component: () => <div data-testid="some-front-page">Some front page</div>,
   }),
 
   injectionToken: routeSpecificComponentInjectionToken,
 });
 
-const testNavigationItemInjectable = getInjectable({
-  id: "some-test-preference-navigation-item-id",
+const testRouteInjectable = getInjectable({
+  id: "some-page",
 
-  instantiate: (di) => {
-    const testRoute = di.inject(testPreferencesRouteInjectable);
-    const navigateToPreferenceTab = di.inject(navigateToPreferenceTabInjectable);
-    const routeIsActive = di.inject(routeIsActiveInjectable, testRoute);
+  instantiate: () => ({
+    path: "/some-page",
+    clusterFrame: false,
+    isEnabled: computed(() => true),
+  }),
 
-    return {
-      id: "some-test-preference-navigation-item-id",
-      label: "Some preference navigation item",
-      parent: "general",
-      isActive: routeIsActive,
-      isVisible: testRoute.isEnabled,
-      navigate: navigateToPreferenceTab(testRoute),
-      orderNumber: 100,
-    };
-  },
-
-  injectionToken: preferenceNavigationItemInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
+});
+
+const testRouteComponentInjectable = getInjectable({
+  id: "some-page-component",
+
+  instantiate: (di) => ({
+    route: di.inject(testRouteInjectable),
+    Component: () => <div data-testid="some-page">Some content</div>,
+  }),
+
+  injectionToken: routeSpecificComponentInjectionToken,
+});
+
+const testPreferenceTabInjectable = getInjectable({
+  id: "test-preference-tab",
+
+  instantiate: () => ({
+    kind: "tab" as const,
+    id: "some-test-tab-id",
+    pathId: "some-path-id-for-some-test-tab-id",
+    parentId: "general-tab-group" as const,
+    testId: "some-test-id-for-some-test-tab-id",
+    label: "Test tab",
+    orderNumber: 90,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+const testPreferenceItemInjectable = getInjectable({
+  id: "test-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "test-item",
+    parentId: "some-test-tab-id" as const,
+    Component: () => <div>irrelevant</div>,
+    orderNumber: 0,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
 });
diff --git a/src/features/preferences/common/navigate-to-application-preferences.injectable.ts b/src/features/preferences/common/navigate-to-application-preferences.injectable.ts
new file mode 100644
index 0000000000..3a1923f4cd
--- /dev/null
+++ b/src/features/preferences/common/navigate-to-application-preferences.injectable.ts
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import navigateToPreferencesInjectable from "./navigate-to-preferences.injectable";
+
+const navigateToApplicationPreferencesInjectable = getInjectable({
+  id: "navigate-to-application-preferences",
+
+  instantiate: (di) => {
+    const navigateToPreferences = di.inject(navigateToPreferencesInjectable);
+
+    return () => navigateToPreferences("app");
+  },
+});
+
+export default navigateToApplicationPreferencesInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/editor/navigate-to-editor-preferences.injectable.ts b/src/features/preferences/common/navigate-to-editor-preferences.injectable.ts
similarity index 53%
rename from src/common/front-end-routing/routes/preferences/editor/navigate-to-editor-preferences.injectable.ts
rename to src/features/preferences/common/navigate-to-editor-preferences.injectable.ts
index ab4be540cf..8b843003b4 100644
--- a/src/common/front-end-routing/routes/preferences/editor/navigate-to-editor-preferences.injectable.ts
+++ b/src/features/preferences/common/navigate-to-editor-preferences.injectable.ts
@@ -3,17 +3,15 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import editorPreferencesRouteInjectable from "./editor-preferences-route.injectable";
-import { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token";
+import navigateToPreferencesInjectable from "./navigate-to-preferences.injectable";
 
 const navigateToEditorPreferencesInjectable = getInjectable({
   id: "navigate-to-editor-preferences",
 
   instantiate: (di) => {
-    const navigateToRoute = di.inject(navigateToRouteInjectionToken);
-    const route = di.inject(editorPreferencesRouteInjectable);
+    const navigateToPreferences = di.inject(navigateToPreferencesInjectable);
 
-    return () => navigateToRoute(route);
+    return () => navigateToPreferences("editor");
   },
 });
 
diff --git a/src/common/front-end-routing/routes/preferences/kubernetes/navigate-to-kubernetes-preferences.injectable.ts b/src/features/preferences/common/navigate-to-kubernetes-preferences.injectable.ts
similarity index 52%
rename from src/common/front-end-routing/routes/preferences/kubernetes/navigate-to-kubernetes-preferences.injectable.ts
rename to src/features/preferences/common/navigate-to-kubernetes-preferences.injectable.ts
index 35f4de6621..0d995d6169 100644
--- a/src/common/front-end-routing/routes/preferences/kubernetes/navigate-to-kubernetes-preferences.injectable.ts
+++ b/src/features/preferences/common/navigate-to-kubernetes-preferences.injectable.ts
@@ -3,17 +3,15 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import kubernetesPreferencesRouteInjectable from "./kubernetes-preferences-route.injectable";
-import { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token";
+import navigateToPreferencesInjectable from "./navigate-to-preferences.injectable";
 
 const navigateToKubernetesPreferencesInjectable = getInjectable({
   id: "navigate-to-kubernetes-preferences",
 
   instantiate: (di) => {
-    const navigateToRoute = di.inject(navigateToRouteInjectionToken);
-    const route = di.inject(kubernetesPreferencesRouteInjectable);
+    const navigateToPreferences = di.inject(navigateToPreferencesInjectable);
 
-    return () => navigateToRoute(route);
+    return () => navigateToPreferences("kubernetes");
   },
 });
 
diff --git a/src/features/preferences/common/navigate-to-preferences.injectable.ts b/src/features/preferences/common/navigate-to-preferences.injectable.ts
new file mode 100644
index 0000000000..c06137d704
--- /dev/null
+++ b/src/features/preferences/common/navigate-to-preferences.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { navigateToRouteInjectionToken } from "../../../common/front-end-routing/navigate-to-route-injection-token";
+import preferencesRouteInjectable from "./preferences-route.injectable";
+
+const navigateToPreferencesInjectable = getInjectable({
+  id: "navigate-to-preferences",
+
+  instantiate: (di) => {
+    const navigateToRoute = di.inject(navigateToRouteInjectionToken);
+    const preferencesRoute = di.inject(preferencesRouteInjectable);
+
+    return (tabId?: string) =>
+      navigateToRoute(preferencesRoute, {
+        parameters: tabId ? { preferenceTabId: tabId } : {},
+      });
+  },
+});
+
+export default navigateToPreferencesInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/proxy/navigate-to-proxy-preferences.injectable.ts b/src/features/preferences/common/navigate-to-proxy-preferences.injectable.ts
similarity index 53%
rename from src/common/front-end-routing/routes/preferences/proxy/navigate-to-proxy-preferences.injectable.ts
rename to src/features/preferences/common/navigate-to-proxy-preferences.injectable.ts
index 258be70c60..c95ad757f1 100644
--- a/src/common/front-end-routing/routes/preferences/proxy/navigate-to-proxy-preferences.injectable.ts
+++ b/src/features/preferences/common/navigate-to-proxy-preferences.injectable.ts
@@ -3,17 +3,15 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import proxyPreferencesRouteInjectable from "./proxy-preferences-route.injectable";
-import { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token";
+import navigateToPreferencesInjectable from "./navigate-to-preferences.injectable";
 
 const navigateToProxyPreferencesInjectable = getInjectable({
   id: "navigate-to-proxy-preferences",
 
   instantiate: (di) => {
-    const navigateToRoute = di.inject(navigateToRouteInjectionToken);
-    const route = di.inject(proxyPreferencesRouteInjectable);
+    const navigateToPreferences = di.inject(navigateToPreferencesInjectable);
 
-    return () => navigateToRoute(route);
+    return () => navigateToPreferences("proxy");
   },
 });
 
diff --git a/src/common/front-end-routing/routes/preferences/telemetry/navigate-to-telemetry-preferences.injectable.ts b/src/features/preferences/common/navigate-to-telemetry-preferences.injectable.ts
similarity index 52%
rename from src/common/front-end-routing/routes/preferences/telemetry/navigate-to-telemetry-preferences.injectable.ts
rename to src/features/preferences/common/navigate-to-telemetry-preferences.injectable.ts
index 45f7559ba9..6d82feb148 100644
--- a/src/common/front-end-routing/routes/preferences/telemetry/navigate-to-telemetry-preferences.injectable.ts
+++ b/src/features/preferences/common/navigate-to-telemetry-preferences.injectable.ts
@@ -3,17 +3,15 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import telemetryPreferencesRouteInjectable from "./telemetry-preferences-route.injectable";
-import { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token";
+import navigateToPreferencesInjectable from "./navigate-to-preferences.injectable";
 
 const navigateToTelemetryPreferencesInjectable = getInjectable({
   id: "navigate-to-telemetry-preferences",
 
   instantiate: (di) => {
-    const navigateToRoute = di.inject(navigateToRouteInjectionToken);
-    const route = di.inject(telemetryPreferencesRouteInjectable);
+    const navigateToPreferences = di.inject(navigateToPreferencesInjectable);
 
-    return () => navigateToRoute(route);
+    return () => navigateToPreferences("telemetry");
   },
 });
 
diff --git a/src/common/front-end-routing/routes/preferences/terminal/navigate-to-terminal-preferences.injectable.ts b/src/features/preferences/common/navigate-to-terminal-preferences.injectable.ts
similarity index 52%
rename from src/common/front-end-routing/routes/preferences/terminal/navigate-to-terminal-preferences.injectable.ts
rename to src/features/preferences/common/navigate-to-terminal-preferences.injectable.ts
index 8f73e556d3..66684e47ea 100644
--- a/src/common/front-end-routing/routes/preferences/terminal/navigate-to-terminal-preferences.injectable.ts
+++ b/src/features/preferences/common/navigate-to-terminal-preferences.injectable.ts
@@ -3,17 +3,15 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import terminalPreferencesRouteInjectable from "./terminal-preferences-route.injectable";
-import { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token";
+import navigateToPreferencesInjectable from "./navigate-to-preferences.injectable";
 
 const navigateToTerminalPreferencesInjectable = getInjectable({
   id: "navigate-to-terminal-preferences",
 
   instantiate: (di) => {
-    const navigateToRoute = di.inject(navigateToRouteInjectionToken);
-    const route = di.inject(terminalPreferencesRouteInjectable);
+    const navigateToPreferences = di.inject(navigateToPreferencesInjectable);
 
-    return () => navigateToRoute(route);
+    return () => navigateToPreferences("terminal");
   },
 });
 
diff --git a/src/common/catalog-entities/general-catalog-entities/implementations/preferences-catalog-entity.injectable.ts b/src/features/preferences/common/preferences-catalog-entity.injectable.ts
similarity index 67%
rename from src/common/catalog-entities/general-catalog-entities/implementations/preferences-catalog-entity.injectable.ts
rename to src/features/preferences/common/preferences-catalog-entity.injectable.ts
index 80d4458b6d..e4f3a65a93 100644
--- a/src/common/catalog-entities/general-catalog-entities/implementations/preferences-catalog-entity.injectable.ts
+++ b/src/features/preferences/common/preferences-catalog-entity.injectable.ts
@@ -3,16 +3,16 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { generalCatalogEntityInjectionToken } from "../general-catalog-entity-injection-token";
-import { GeneralEntity } from "../../index";
-import { buildURL } from "../../../utils/buildUrl";
-import appPreferencesRouteInjectable from "../../../front-end-routing/routes/preferences/app/app-preferences-route.injectable";
+import { generalCatalogEntityInjectionToken } from "../../../common/catalog-entities/general-catalog-entities/general-catalog-entity-injection-token";
+import { GeneralEntity } from "../../../common/catalog-entities";
+import { buildURL } from "../../../common/utils/buildUrl";
+import preferencesRouteInjectable from "./preferences-route.injectable";
 
 const preferencesCatalogEntityInjectable = getInjectable({
   id: "general-catalog-entity-for-preferences",
 
   instantiate: (di) => {
-    const route = di.inject(appPreferencesRouteInjectable);
+    const route = di.inject(preferencesRouteInjectable);
     const url = buildURL(route.path);
 
     return new GeneralEntity({
diff --git a/src/common/front-end-routing/routes/preferences/app/app-preferences-route.injectable.ts b/src/features/preferences/common/preferences-route-for-legacy-extensions.injectable.ts
similarity index 51%
rename from src/common/front-end-routing/routes/preferences/app/app-preferences-route.injectable.ts
rename to src/features/preferences/common/preferences-route-for-legacy-extensions.injectable.ts
index b4dfe5c05b..c1f81953a0 100644
--- a/src/common/front-end-routing/routes/preferences/app/app-preferences-route.injectable.ts
+++ b/src/features/preferences/common/preferences-route-for-legacy-extensions.injectable.ts
@@ -4,13 +4,13 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../common/front-end-routing/front-end-route-injection-token";
 
-const appPreferencesRouteInjectable = getInjectable({
-  id: "app-preferences-route",
+const preferencesRouteForLegacyExtensionsInjectable = getInjectable({
+  id: "preferences-route-for-legacy-extensions",
 
   instantiate: () => ({
-    path: "/preferences/app",
+    path: "/preferences/extension/:extensionId/:preferenceTabId?",
     clusterFrame: false,
     isEnabled: computed(() => true),
   }),
@@ -18,4 +18,4 @@ const appPreferencesRouteInjectable = getInjectable({
   injectionToken: frontEndRouteInjectionToken,
 });
 
-export default appPreferencesRouteInjectable;
+export default preferencesRouteForLegacyExtensionsInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/proxy/proxy-preferences-route.injectable.ts b/src/features/preferences/common/preferences-route.injectable.ts
similarity index 57%
rename from src/common/front-end-routing/routes/preferences/proxy/proxy-preferences-route.injectable.ts
rename to src/features/preferences/common/preferences-route.injectable.ts
index 322e711225..7d7283ed1f 100644
--- a/src/common/front-end-routing/routes/preferences/proxy/proxy-preferences-route.injectable.ts
+++ b/src/features/preferences/common/preferences-route.injectable.ts
@@ -4,13 +4,13 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../common/front-end-routing/front-end-route-injection-token";
 
-const proxyPreferencesRouteInjectable = getInjectable({
-  id: "proxy-preferences-route",
+const preferencesRouteInjectable = getInjectable({
+  id: "preferences-route",
 
   instantiate: () => ({
-    path: "/preferences/proxy",
+    path: "/preferences/:preferenceTabId?",
     clusterFrame: false,
     isEnabled: computed(() => true),
   }),
@@ -18,4 +18,4 @@ const proxyPreferencesRouteInjectable = getInjectable({
   injectionToken: frontEndRouteInjectionToken,
 });
 
-export default proxyPreferencesRouteInjectable;
+export default preferencesRouteInjectable;
diff --git a/src/features/preferences/extension-adding-preference-tabs.test.tsx b/src/features/preferences/extension-adding-preference-tabs.test.tsx
index 47810df727..a68f39f547 100644
--- a/src/features/preferences/extension-adding-preference-tabs.test.tsx
+++ b/src/features/preferences/extension-adding-preference-tabs.test.tsx
@@ -7,6 +7,9 @@ import type { IObservableValue } from "mobx";
 import { runInAction, computed, observable } from "mobx";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import type { Discover } from "../../renderer/components/test-utils/discovery-of-html-elements";
+import { discoverFor } from "../../renderer/components/test-utils/discovery-of-html-elements";
+import React from "react";
 
 describe("preferences: extension adding preference tabs", () => {
   let builder: ApplicationBuilder;
@@ -18,10 +21,13 @@ describe("preferences: extension adding preference tabs", () => {
   describe("given in preferences, when extension with preference tabs is enabled", () => {
     let rendered: RenderResult;
     let someObservable: IObservableValue<boolean>;
+    let discover: Discover;
 
     beforeEach(async () => {
       rendered = await builder.render();
 
+      discover = discoverFor(() => rendered);
+
       builder.preferences.navigate();
 
       someObservable = observable.box(false);
@@ -49,11 +55,43 @@ describe("preferences: extension adding preference tabs", () => {
               visible: computed(() => someObservable.get()),
             },
           ],
+
+          appPreferences: [
+            {
+              title: "some-title",
+              id: "some-preference-item-id",
+              showInPreferencesTab: "some-preference-tab-id",
+
+              components: {
+                Hint: () => <div />,
+                Input: () => <div />,
+              },
+            },
+            {
+              title: "some-other-title",
+              id: "some-other-preference-item-id",
+              showInPreferencesTab: "some-other-preference-tab-id",
+
+              components: {
+                Hint: () => <div />,
+                Input: () => <div />,
+              },
+            },
+            {
+              title: "some-another-title",
+              id: "some-another-preference-item-id",
+              showInPreferencesTab: "some-preference-tab-id-with-controlled-visibility",
+
+              components: {
+                Hint: () => <div />,
+                Input: () => <div />,
+              },
+            },
+          ],
         },
       };
 
       builder.extensions.enable(testExtension);
-
     });
 
     it("renders", () => {
@@ -61,20 +99,25 @@ describe("preferences: extension adding preference tabs", () => {
     });
 
     it("shows tabs in order", () => {
-      const actual = rendered.queryAllByTestId(/tab-link-for-extension-some-extension-nav-item-(.*)/).map(x => x.dataset.testid);
+      const actual = discover
+        .queryAllElements("preference-tab-link")
+        .attributeValues.filter((value) =>
+          value?.startsWith("extension-some-extension"),
+        );
 
       expect(actual).toEqual([
-        "tab-link-for-extension-some-extension-nav-item-some-other-preference-tab-id",
-        "tab-link-for-extension-some-extension-nav-item-some-preference-tab-id",
+        "extension-some-extension-some-other-preference-tab-id",
+        "extension-some-extension-some-preference-tab-id",
       ]);
     });
 
     it("does not show hidden tab", () => {
-      const actual = rendered.queryByTestId(
-        "tab-link-for-extension-some-extension-nav-item-some-preference-tab-id-with-controlled-visibility",
+      const { discovered } = discover.querySingleElement(
+        "preference-tab-link",
+        "extension-some-extension-some-preference-tab-id-with-controlled-visibility",
       );
 
-      expect(actual).not.toBeInTheDocument();
+      expect(discovered).toBeNull();
     });
 
     it("when item becomes visible, shows the tab", () => {
@@ -82,11 +125,12 @@ describe("preferences: extension adding preference tabs", () => {
         someObservable.set(true);
       });
 
-      const actual = rendered.queryByTestId(
-        "tab-link-for-extension-some-extension-nav-item-some-preference-tab-id-with-controlled-visibility",
+      const { discovered } = discover.getSingleElement(
+        "preference-tab-link",
+        "extension-some-extension-some-preference-tab-id-with-controlled-visibility",
       );
 
-      expect(actual).toBeInTheDocument();
+      expect(discovered).not.toBeNull();
     });
   });
 });
diff --git a/src/features/preferences/hiding-of-empty-branches.test.tsx b/src/features/preferences/hiding-of-empty-branches.test.tsx
new file mode 100644
index 0000000000..0bc2d67d24
--- /dev/null
+++ b/src/features/preferences/hiding-of-empty-branches.test.tsx
@@ -0,0 +1,224 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import type { DiContainer } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
+import type { RenderResult } from "@testing-library/react";
+import { runInAction } from "mobx";
+import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import { preferenceItemInjectionToken } from "./renderer/preference-items/preference-item-injection-token";
+import type { Discover } from "../../renderer/components/test-utils/discovery-of-html-elements";
+import { discoverFor } from "../../renderer/components/test-utils/discovery-of-html-elements";
+
+describe("preferences - hiding-of-empty-branches, given in preferences page", () => {
+  let builder: ApplicationBuilder;
+  let rendered: RenderResult;
+  let windowDi: DiContainer;
+  let discover: Discover;
+
+  beforeEach(async () => {
+    builder = getApplicationBuilder();
+
+    rendered = await builder.render();
+
+    discover = discoverFor(() => rendered);
+
+    builder.preferences.navigate();
+
+    windowDi = builder.applicationWindow.only.di;
+  });
+
+  describe("given tab group and empty tabs", () => {
+    beforeEach(() => {
+      const someTabGroupInjectable = getInjectable({
+        id: "some-tab-group",
+
+        instantiate: () => ({
+          kind: "tab-group" as const,
+          id: "some-tab-group",
+          parentId: "preference-tabs" as const,
+          label: "Some tab group label",
+          orderNumber: 10,
+        }),
+
+        injectionToken: preferenceItemInjectionToken,
+      });
+
+      const someTabInjectable = getInjectable({
+        id: "some-tab",
+
+        instantiate: () => ({
+          kind: "tab" as const,
+          id: "some-tab-id",
+          parentId: "some-tab-group" as const,
+          pathId: "some-path-id-for-some-tab-id",
+          label: "Some tab label",
+          orderNumber: 10,
+        }),
+
+        injectionToken: preferenceItemInjectionToken,
+      });
+
+      const someOtherTabInjectable = getInjectable({
+        id: "some-other-tab",
+
+        instantiate: () => ({
+          kind: "tab" as const,
+          id: "some-other-tab-id",
+          parentId: "some-tab-group" as const,
+          pathId: "some-path-id-for-some-other-tab-id",
+          label: "Some other tab label",
+          orderNumber: 10,
+        }),
+
+        injectionToken: preferenceItemInjectionToken,
+      });
+
+      runInAction(() => {
+        windowDi.register(
+          someTabGroupInjectable,
+          someTabInjectable,
+          someOtherTabInjectable,
+        );
+      });
+    });
+
+    it("renders", () => {
+      expect(rendered.container).toMatchSnapshot();
+    });
+
+    it("does not render the empty tab group", () => {
+      const { discovered } = discover.querySingleElement(
+        "preference-tab-group",
+        "some-tab-group",
+      );
+
+      expect(discovered).toBeNull();
+    });
+
+    it("does not render the empty tabs", () => {
+      const { discovered: someTab } = discover.querySingleElement(
+        "preference-tab-link",
+        "some-path-id-for-some-tab-id",
+      );
+
+      const { discovered: someOtherTab } = discover.querySingleElement(
+        "preference-tab-link",
+        "some-path-id-for-some-other-tab-id",
+      );
+
+      expect([someTab, someOtherTab]).toEqual([null, null]);
+    });
+
+    describe("when an item appears for one of the tabs", () => {
+      beforeEach(() => {
+        const itemForTabInjectable = getInjectable({
+          id: "some-preference-item",
+
+          instantiate: () => ({
+            kind: "block" as const,
+            id: "some-preference-item-id",
+            parentId: "some-tab-id" as const,
+            testId: "some-preference-item",
+            Component: () => <div>Irrelevant</div>,
+            orderNumber: 10,
+          }),
+
+          injectionToken: preferenceItemInjectionToken,
+        });
+
+        runInAction(() => {
+          windowDi.register(itemForTabInjectable);
+        });
+      });
+
+      it("renders", () => {
+        expect(rendered.container).toMatchSnapshot();
+      });
+
+      it("renders the tab group that is no longer empty", () => {
+        const { discovered } = discover.querySingleElement(
+          "preference-tab-group",
+          "some-tab-group",
+        );
+
+        expect(discovered).not.toBeNull();
+      });
+
+      it("renders the tab that is no longer empty", () => {
+        const { discovered } = discover.getSingleElement(
+          "preference-tab-link",
+          "some-path-id-for-some-tab-id",
+        );
+
+        expect(discovered).not.toBeNull();
+      });
+
+      it("does not render the tab that is still empty", () => {
+        const { discovered } = discover.querySingleElement(
+          "preference-tab-link",
+          "some-path-id-for-some-other-tab-id",
+        );
+
+        expect(discovered).toBeNull();
+      });
+
+      describe("when an item appears for the remaining tab", () => {
+        beforeEach(() => {
+          const itemForTabInjectable = getInjectable({
+            id: "some-other-preference-item",
+
+            instantiate: () => ({
+              kind: "block" as const,
+              id: "some-other-preference-item-id",
+              parentId: "some-other-tab-id" as const,
+              testId: "some-other-preference-item",
+              Component: () => <div>Irrelevant</div>,
+              orderNumber: 10,
+            }),
+
+            injectionToken: preferenceItemInjectionToken,
+          });
+
+          runInAction(() => {
+            windowDi.register(itemForTabInjectable);
+          });
+        });
+
+        it("renders", () => {
+          expect(rendered.container).toMatchSnapshot();
+        });
+
+        it("still renders the tab group that is not empty", () => {
+          const { discovered } = discover.getSingleElement(
+            "preference-tab-group",
+            "some-tab-group",
+          );
+
+          expect(discovered).not.toBeNull();
+        });
+
+        it("still renders the tab that is not empty", () => {
+          const { discovered } = discover.getSingleElement(
+            "preference-tab-link",
+            "some-path-id-for-some-tab-id",
+          );
+
+          expect(discovered).not.toBeNull();
+        });
+
+        it("now renders the other tab that is no longer empty", () => {
+          const { discovered } = discover.getSingleElement(
+            "preference-tab-link",
+            "some-path-id-for-some-other-tab-id",
+          );
+
+          expect(discovered).not.toBeNull();
+        });
+      });
+    });
+  });
+});
diff --git a/src/features/preferences/navigation-to-application-preferences.test.ts b/src/features/preferences/navigation-to-application-preferences.test.ts
index c90a2b3cc5..f384efc1b3 100644
--- a/src/features/preferences/navigation-to-application-preferences.test.ts
+++ b/src/features/preferences/navigation-to-application-preferences.test.ts
@@ -5,7 +5,9 @@
 import type { RenderResult } from "@testing-library/react";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import navigateToProxyPreferencesInjectable from "../../common/front-end-routing/routes/preferences/proxy/navigate-to-proxy-preferences.injectable";
+import navigateToProxyPreferencesInjectable from "./common/navigate-to-proxy-preferences.injectable";
+import type { Discover } from "../../renderer/components/test-utils/discovery-of-html-elements";
+import { discoverFor } from "../../renderer/components/test-utils/discovery-of-html-elements";
 
 describe("preferences - navigation to application preferences", () => {
   let builder: ApplicationBuilder;
@@ -16,6 +18,7 @@ describe("preferences - navigation to application preferences", () => {
 
   describe("given in some child page of preferences, when rendered", () => {
     let rendered: RenderResult;
+    let discover: Discover;
 
     beforeEach(async () => {
       builder.beforeWindowStart((windowDi) => {
@@ -25,6 +28,8 @@ describe("preferences - navigation to application preferences", () => {
       });
 
       rendered = await builder.render();
+
+      discover = discoverFor(() => rendered);
     });
 
     it("renders", () => {
@@ -32,14 +37,17 @@ describe("preferences - navigation to application preferences", () => {
     });
 
     it("does not show application preferences yet", () => {
-      const page = rendered.queryByTestId("application-preferences-page");
+      const { discovered } = discover.querySingleElement(
+        "preference-page",
+        "application-page",
+      );
 
-      expect(page).toBeNull();
+      expect(discovered).toBeNull();
     });
 
     describe("when navigating to application preferences using navigation", () => {
       beforeEach(() => {
-        builder.preferences.navigation.click("application");
+        builder.preferences.navigation.click("app");
       });
 
       it("renders", () => {
@@ -47,10 +55,33 @@ describe("preferences - navigation to application preferences", () => {
       });
 
       it("shows application preferences", () => {
-        const page = rendered.getByTestId("application-preferences-page");
+        const { discovered } = discover.getSingleElement(
+          "preference-page",
+          "application-page",
+        );
 
-        expect(page).not.toBeNull();
+        expect(discovered).not.toBeNull();
+      });
+    });
+
+    describe("when navigating to preferences without specifying the tab", () => {
+      beforeEach(() => {
+        builder.preferences.navigate();
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("shows tab for application preferences for it being the default", () => {
+        const { discovered } = discover.getSingleElement(
+          "preference-page",
+          "application-page",
+        );
+
+        expect(discovered).not.toBeNull();
       });
     });
   });
 });
+
diff --git a/src/features/preferences/navigation-to-editor-preferences.test.ts b/src/features/preferences/navigation-to-editor-preferences.test.ts
index 7a37abbc8c..018a27210a 100644
--- a/src/features/preferences/navigation-to-editor-preferences.test.ts
+++ b/src/features/preferences/navigation-to-editor-preferences.test.ts
@@ -5,9 +5,12 @@
 import type { RenderResult } from "@testing-library/react";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import type { Discover } from "../../renderer/components/test-utils/discovery-of-html-elements";
+import { discoverFor } from "../../renderer/components/test-utils/discovery-of-html-elements";
 
 describe("preferences - navigation to editor preferences", () => {
   let applicationBuilder: ApplicationBuilder;
+  let discover: Discover;
 
   beforeEach(() => {
     applicationBuilder = getApplicationBuilder();
@@ -22,16 +25,20 @@ describe("preferences - navigation to editor preferences", () => {
       });
 
       rendered = await applicationBuilder.render();
+
+      discover = discoverFor(() => rendered);
     });
 
     it("renders", () => {
       expect(rendered.container).toMatchSnapshot();
     });
-
     it("does not show editor preferences yet", () => {
-      const page = rendered.queryByTestId("editor-preferences-page");
+      const { discovered } = discover.querySingleElement(
+        "preference-page",
+        "editor-page",
+      );
 
-      expect(page).toBeNull();
+      expect(discovered).toBeNull();
     });
 
     describe("when navigating to editor preferences using navigation", () => {
@@ -44,7 +51,10 @@ describe("preferences - navigation to editor preferences", () => {
       });
 
       it("shows editor preferences", () => {
-        const page = rendered.getByTestId("editor-preferences-page");
+        const page = discover.getSingleElement(
+          "preference-page",
+          "editor-page",
+        );
 
         expect(page).not.toBeNull();
       });
diff --git a/src/features/preferences/navigation-to-extension-specific-preferences.test.tsx b/src/features/preferences/navigation-to-extension-specific-preferences.test.tsx
index cb44c1770c..4480871986 100644
--- a/src/features/preferences/navigation-to-extension-specific-preferences.test.tsx
+++ b/src/features/preferences/navigation-to-extension-specific-preferences.test.tsx
@@ -7,8 +7,10 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import React from "react";
 import "@testing-library/jest-dom/extend-expect";
-import extensionPreferencesRouteInjectable from "../../common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable";
 import type { FakeExtensionOptions } from "../../renderer/components/test-utils/get-extension-fake";
+import type { Discover } from "../../renderer/components/test-utils/discovery-of-html-elements";
+import { discoverFor } from "../../renderer/components/test-utils/discovery-of-html-elements";
+import logErrorInjectable from "../../common/log-error.injectable";
 
 describe("preferences - navigation to extension specific preferences", () => {
   let builder: ApplicationBuilder;
@@ -19,13 +21,21 @@ describe("preferences - navigation to extension specific preferences", () => {
 
   describe("given in preferences, when rendered", () => {
     let rendered: RenderResult;
+    let logErrorMock: jest.Mock;
+    let discover: Discover;
 
     beforeEach(async () => {
-      builder.beforeWindowStart(() => {
+      logErrorMock = jest.fn();
+
+      builder.beforeWindowStart((windowDi) => {
+        windowDi.override(logErrorInjectable, () => logErrorMock);
+
         builder.preferences.navigate();
       });
 
       rendered = await builder.render();
+
+      discover = discoverFor(() => rendered);
     });
 
     it("renders", () => {
@@ -33,9 +43,13 @@ describe("preferences - navigation to extension specific preferences", () => {
     });
 
     it("does not show extension preferences yet", () => {
-      const page = rendered.queryByTestId("extension-preferences-page");
+      // Todo: check if query is correct.
+      const { discovered } = discover.querySingleElement(
+        "preference-page",
+        "extension",
+      );
 
-      expect(page).toBeNull();
+      expect(discovered).toBeNull();
     });
 
     it("does not show link for extension preferences", () => {
@@ -52,7 +66,7 @@ describe("preferences - navigation to extension specific preferences", () => {
         );
 
         builder.preferences.navigation.click(
-          "extension-some-test-extension-id",
+          "some-test-extension-id",
         );
       });
 
@@ -61,15 +75,21 @@ describe("preferences - navigation to extension specific preferences", () => {
       });
 
       it("doesn't show preferences from unrelated extension", () => {
-        const actual = rendered.queryByTestId("extension-preference-item-for-some-other-preference-item-id");
+        const { discovered } = discover.querySingleElement(
+          "preference-page",
+          "preference-item-for-extension-some-other-test-extension-id-page",
+        );
 
-        expect(actual).toBeNull();
+        expect(discovered).toBeNull();
       });
 
       it("shows preferences from related extension", () => {
-        const actual = rendered.getByTestId("extension-preference-item-for-some-preference-item-id");
+        const { discovered } = discover.getSingleElement(
+          "preference-page",
+          "preference-item-for-extension-some-test-extension-id-page",
+        );
 
-        expect(actual).not.toBeNull();
+        expect(discovered).not.toBeNull();
       });
     });
 
@@ -104,21 +124,18 @@ describe("preferences - navigation to extension specific preferences", () => {
         expect(rendered.container).toMatchSnapshot();
       });
 
-      it("shows link for extension preferences", () => {
-        const actual = rendered.getByTestId("tab-link-for-extension-some-test-extension-id");
-
-        expect(actual).not.toBeNull();
-      });
-
       it("link should not be active", () => {
-        const actual = rendered.getByTestId("tab-link-for-extension-some-test-extension-id");
+        const { discovered } = discover.getSingleElement(
+          "preference-tab-link",
+          "some-test-extension-id",
+        );
 
-        expect(actual).not.toHaveClass("active");
+        expect(discovered).not.toHaveClass("active");
       });
 
       describe("when navigating to extension preferences using navigation", () => {
         beforeEach(() => {
-          builder.preferences.navigation.click("extension-some-test-extension-id");
+          builder.preferences.navigation.click("some-test-extension-id");
         });
 
         it("renders", () => {
@@ -126,33 +143,27 @@ describe("preferences - navigation to extension specific preferences", () => {
         });
 
         it("shows proper page title", () => {
-          const title = rendered.getByText("some-test-extension-id preferences");
+          const { discovered } = discover.getSingleElement("preference-page-title");
 
-          expect(title).toBeInTheDocument();
+          expect(discovered).toHaveTextContent("some-test-extension-id preferences");
         });
 
-        it("shows extension specific preferences", () => {
-          const page = rendered.getByTestId("extension-preferences-page");
+        it("shows only extension specific preference items", () => {
+          const { attributeValues } =
+            discover.queryAllElements("preference-item");
 
-          expect(page).not.toBeNull();
-        });
-
-        it("shows extension specific preference item", () => {
-          const actual = rendered.getByTestId("extension-preference-item-for-some-preference-item-id");
-
-          expect(actual).not.toBeNull();
-        });
-
-        it("does not show unrelated preference tab items", () => {
-          const actual = rendered.queryByTestId("extension-preference-item-for-some-unrelated-preference-item-id");
-
-          expect(actual).toBeNull();
+          expect(attributeValues).toEqual([
+            "preference-item-for-extension-some-test-extension-id-item-some-preference-item-id",
+          ]);
         });
 
         it("link is active", () => {
-          const actual = rendered.getByTestId("tab-link-for-extension-some-test-extension-id");
+          const { discovered } = discover.getSingleElement(
+            "preference-tab-link",
+            "some-test-extension-id",
+          );
 
-          expect(actual).toHaveClass("active");
+          expect(discovered).toHaveClass("active");
         });
 
         describe("when extension is disabled", () => {
@@ -164,14 +175,21 @@ describe("preferences - navigation to extension specific preferences", () => {
             expect(rendered.baseElement).toMatchSnapshot();
           });
 
-          it("shows the error message about extension not being present", () => {
-            expect(rendered.getByTestId("error-for-extension-not-being-present")).toBeInTheDocument();
+          it("does not show any preference page", () => {
+            const { discovered } = discover.querySingleElement("preference-page");
+
+            expect(discovered).toBeNull();
           });
 
-          it("when extension is enabled again, does not show the error message anymore", () => {
+          it("when extension is enabled again, shows the preference page", () => {
             builder.extensions.enable(extensionStubWithExtensionSpecificPreferenceItems);
 
-            expect(rendered.queryByTestId("error-for-extension-not-being-present")).not.toBeInTheDocument();
+            const { discovered } = discover.getSingleElement(
+              "preference-page",
+              "preference-item-for-extension-some-test-extension-id-page",
+            );
+
+            expect(discovered).not.toBeNull();
           });
         });
       });
@@ -179,90 +197,103 @@ describe("preferences - navigation to extension specific preferences", () => {
 
     describe("given extension with registered tab", () => {
       beforeEach(() => {
-        builder.extensions.enable(extensionStubWithWithRegisteredTab);
+        builder.extensions.enable(extensionStubWithRegisteredTab);
+      });
+
+      it("logs error", () => {
+        expect(
+          logErrorMock.mock.calls[0][0].startsWith(
+            "Tried to create preferences, but encountered references to unknown ids",
+          ),
+        ).toBe(true);
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
       });
 
       it("shows extension tab in general area", () => {
-        const actual = rendered.getByTestId("tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab");
+        const { discovered } = discover
+          .getSingleElement("preference-tab-group", "general-tab-group")
+          .getSingleElement(
+            "preference-tab-link",
+            "extension-registered-tab-page-id-metrics-extension-tab",
+          );
 
-        expect(actual).toMatchSnapshot();
+        expect(discovered).not.toBeNull();
       });
 
-      it("does not show custom settings block", () => {
-        const actual = rendered.queryByTestId("extension-settings");
+      it("does not show tab group for extensions for there being no content", () => {
+        const { discovered } = discover.querySingleElement(
+          "preference-tab-group",
+          "extensions-tab-group",
+        );
 
-        expect(actual).not.toBeInTheDocument();
+        expect(discovered).toBeNull();
       });
 
       describe("when navigating to specific extension tab", () => {
         beforeEach(() => {
-          builder.preferences.navigation.click("extension-registered-tab-page-id-nav-item-metrics-extension-tab");
+          builder.preferences.navigation.click("extension-registered-tab-page-id-metrics-extension-tab");
         });
+
         it("renders", () => {
           expect(rendered.container).toMatchSnapshot();
         });
+
         it("shows related preferences for this tab", () => {
           const actual = rendered.getByTestId("metrics-preference-item-hint");
 
           expect(actual).toBeInTheDocument();
         });
+
         it("does not show unrelated preferences for this tab", () => {
           const actual = rendered.queryByTestId("survey-preference-item-hint");
 
           expect(actual).not.toBeInTheDocument();
         });
-        it("shows page title", () => {
-          const pageTitle = rendered.queryByTestId("extension-preferences-page-title");
 
-          expect(pageTitle).toBeInTheDocument();
+        it("shows correct page title", () => {
+          const { discovered } = discover.getSingleElement(
+            "preference-page-title",
+          );
+
+          expect(discovered).toHaveTextContent("Metrics tab");
         });
-        it("shows page title same as tab title", () => {
-          const pageTitle = rendered.queryByTestId("extension-preferences-page-title");
-          const tabs = extensionStubWithWithRegisteredTab.rendererOptions?.appPreferenceTabs;
-          const tabTitle = tabs && tabs[0].title;
-
-          expect(pageTitle?.innerHTML).toBe(tabTitle);
-        });
-      });
-    });
-
-    describe("given extension with few registered tabs", () => {
-      const tabs = [
-        "tab-link-for-extension-hello-world-tab-page-id-nav-item-hello-extension-tab",
-        "tab-link-for-extension-hello-world-tab-page-id-nav-item-logs-extension-tab",
-      ];
-
-      beforeEach(() => {
-        builder.extensions.enable(extensionStubWithWithRegisteredTabs);
-      });
-
-      it.each(tabs)("shows '%s' tab in general area", (tab) => {
-        const tabElement = rendered.getByTestId(tab);
-
-        expect(tabElement).toBeInTheDocument();
       });
     });
 
     describe("given extensions with tabs having same id", () => {
       beforeEach(() => {
-        builder.extensions.enable(extensionStubWithWithRegisteredTab, extensionStubWithWithSameRegisteredTab);
+        builder.extensions.enable(
+          extensionStubWithRegisteredTab,
+          extensionStubWithSameRegisteredTab,
+        );
       });
 
       it("shows tab from the first extension", () => {
-        const actual = rendered.getByTestId("tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab");
+        const { discovered } = discover.getSingleElement(
+          "preference-tab-link",
+          "extension-registered-tab-page-id-metrics-extension-tab",
+        );
 
-        expect(actual).toBeInTheDocument();
+        expect(discovered).toBeInTheDocument();
       });
 
       it("shows tab from the second extension", () => {
-        const actual = rendered.getByTestId("tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab");
+        const { discovered } = discover.getSingleElement(
+          "preference-tab-link",
+          "extension-duplicated-tab-page-id-metrics-extension-tab",
+        );
 
-        expect(actual).toBeInTheDocument();
+        expect(discovered).toBeInTheDocument();
       });
 
       describe("when navigating to first extension tab", () => {
         beforeEach(() => {
-          builder.preferences.navigation.click("extension-registered-tab-page-id-nav-item-metrics-extension-tab");
+          builder.preferences.navigation.click(
+            "extension-registered-tab-page-id-metrics-extension-tab",
+          );
         });
 
         it("renders", () => {
@@ -270,21 +301,19 @@ describe("preferences - navigation to extension specific preferences", () => {
         });
 
         it("shows related preferences for this tab", () => {
-          const actual = rendered.getByTestId("metrics-preference-item-hint");
+          const { attributeValues } = discover.queryAllElements("preference-item");
 
-          expect(actual).toBeInTheDocument();
-        });
-
-        it("does not show unrelated preferences for this tab", () => {
-          const actual = rendered.queryByTestId("another-metrics-preference-item-hint");
-
-          expect(actual).not.toBeInTheDocument();
+          expect(attributeValues).toEqual([
+            "preference-item-for-extension-registered-tab-page-id-item-metrics-preference-item-id",
+          ]);
         });
       });
 
       describe("when navigating to second extension tab", () => {
         beforeEach(() => {
-          builder.preferences.navigation.click("extension-duplicated-tab-page-id-nav-item-metrics-extension-tab");
+          builder.preferences.navigation.click(
+            "extension-duplicated-tab-page-id-metrics-extension-tab",
+          );
         });
 
         it("renders", () => {
@@ -292,74 +321,16 @@ describe("preferences - navigation to extension specific preferences", () => {
         });
 
         it("shows related preferences for this tab", () => {
-          const actual = rendered.getByTestId("another-metrics-preference-item-hint");
+          const { attributeValues } =
+            discover.queryAllElements("preference-item");
 
-          expect(actual).toBeInTheDocument();
-        });
-
-        it("does not show unrelated preferences for this tab", () => {
-          const actual = rendered.queryByTestId("metrics-preference-item-hint");
-
-          expect(actual).not.toBeInTheDocument();
+          expect(attributeValues).toEqual([
+            "preference-item-for-extension-duplicated-tab-page-id-item-another-metrics-preference-item-id",
+          ]);
         });
       });
     });
   });
-
-  describe("when navigating to extension specific tab", () => {
-    let rendered: RenderResult;
-
-    beforeEach(async () => {
-      builder.beforeWindowStart((windowDi) => {
-        const extensionRoute = windowDi.inject(extensionPreferencesRouteInjectable);
-
-        const params = { parameters: {
-          extensionId: "duplicated-tab-page-id",
-          tabId: "metrics-extension-tab",
-        }};
-
-        builder.preferences.navigateTo(extensionRoute, params);
-      });
-
-      builder.extensions.enable(extensionStubWithWithSameRegisteredTab, extensionUsingSomeoneElseTab);
-      rendered = await builder.render();
-    });
-
-    it("renders", () => {
-      expect(rendered.container).toMatchSnapshot();
-    });
-
-    it("does render related preferences for specific tab", () => {
-      expect(rendered.getByTestId("another-metrics-preference-item-hint")).toBeInTheDocument();
-    });
-
-    it("does not render related preferences for specific tab", () => {
-      expect(rendered.queryByTestId("my-preferences-item-hint")).not.toBeInTheDocument();
-    });
-  });
-
-  describe("when navigating to someone else extension specific tab", () => {
-    let rendered: RenderResult;
-
-    beforeEach(async () => {
-      builder.beforeWindowStart((windowDi) => {
-        const extensionRoute = windowDi.inject(extensionPreferencesRouteInjectable);
-        const params = { parameters: {
-          extensionId: "extension-using-someone-else-tab-id",
-          tabId: "metrics-extension-tab",
-        }};
-
-        builder.preferences.navigateTo(extensionRoute, params);
-      });
-
-      builder.extensions.enable(extensionStubWithWithSameRegisteredTab, extensionUsingSomeoneElseTab);
-      rendered = await builder.render();
-    });
-
-    it("renders", () => {
-      expect(rendered.container).toMatchSnapshot();
-    });
-  });
 });
 
 const extensionStubWithExtensionSpecificPreferenceItems: FakeExtensionOptions = {
@@ -436,7 +407,7 @@ const extensionStubWithShowInPreferencesTab: FakeExtensionOptions = {
   },
 };
 
-const extensionStubWithWithRegisteredTab: FakeExtensionOptions = {
+const extensionStubWithRegisteredTab: FakeExtensionOptions = {
   id: "registered-tab-page-id",
   name: "registered-tab-page-id",
 
@@ -482,47 +453,7 @@ const extensionStubWithWithRegisteredTab: FakeExtensionOptions = {
   },
 };
 
-const extensionStubWithWithRegisteredTabs: FakeExtensionOptions = {
-  id: "hello-world-tab-page-id",
-  name: "hello-world-tab-page-id",
-
-  rendererOptions: {
-    appPreferences: [
-      {
-        title: "Hello world",
-        id: "hello-preference-item-id",
-        showInPreferencesTab: "hello-extension-tab",
-
-        components: {
-          Hint: () => <div data-testid="hello-preference-item-hint" />,
-          Input: () => <div data-testid="hello-preference-item-input" />,
-        },
-      },
-      {
-        title: "Logs",
-        id: "logs-preference-item-id",
-        showInPreferencesTab: "logs-extension-tab",
-
-        components: {
-          Hint: () => <div data-testid="logs-preference-item-hint" />,
-          Input: () => <div data-testid="logs-preference-item-input" />,
-        },
-      },
-    ],
-
-    appPreferenceTabs: [{
-      title: "Metrics tab",
-      id: "hello-extension-tab",
-      orderNumber: 100,
-    }, {
-      title: "Logs tab",
-      id: "logs-extension-tab",
-      orderNumber: 200,
-    }],
-  },
-};
-
-const extensionStubWithWithSameRegisteredTab: FakeExtensionOptions = {
+const extensionStubWithSameRegisteredTab: FakeExtensionOptions = {
   id: "duplicated-tab-page-id",
   name: "duplicated-tab-page-id",
 
@@ -547,23 +478,3 @@ const extensionStubWithWithSameRegisteredTab: FakeExtensionOptions = {
     }],
   },
 };
-
-const extensionUsingSomeoneElseTab: FakeExtensionOptions = {
-  id: "extension-using-someone-else-tab-id",
-  name: "extension-using-someone-else-tab-id",
-
-  rendererOptions: {
-    appPreferences: [
-      {
-        title: "My preferences",
-        id: "my-preferences-item-id",
-        showInPreferencesTab: "metrics-extension-tab",
-
-        components: {
-          Hint: () => <div data-testid="my-preferences-item-hint" />,
-          Input: () => <div data-testid="my-preferences-item-input" />,
-        },
-      },
-    ],
-  },
-};
diff --git a/src/features/preferences/navigation-to-kubernetes-preferences.test.ts b/src/features/preferences/navigation-to-kubernetes-preferences.test.ts
index 3bdf1c611b..925d600545 100644
--- a/src/features/preferences/navigation-to-kubernetes-preferences.test.ts
+++ b/src/features/preferences/navigation-to-kubernetes-preferences.test.ts
@@ -5,8 +5,10 @@
 import type { RenderResult } from "@testing-library/react";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
+import callForPublicHelmRepositoriesInjectable from "../helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
 import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
+import type { Discover } from "../../renderer/components/test-utils/discovery-of-html-elements";
+import { discoverFor } from "../../renderer/components/test-utils/discovery-of-html-elements";
 
 describe("preferences - navigation to kubernetes preferences", () => {
   let builder: ApplicationBuilder;
@@ -17,6 +19,7 @@ describe("preferences - navigation to kubernetes preferences", () => {
 
   describe("given in preferences, when rendered", () => {
     let rendered: RenderResult;
+    let discover: Discover;
 
     beforeEach(async () => {
       builder.beforeApplicationStart((mainDi) => {
@@ -35,6 +38,8 @@ describe("preferences - navigation to kubernetes preferences", () => {
       });
 
       rendered = await builder.render();
+
+      discover = discoverFor(() => rendered);
     });
 
     it("renders", () => {
@@ -42,9 +47,12 @@ describe("preferences - navigation to kubernetes preferences", () => {
     });
 
     it("does not show kubernetes preferences yet", () => {
-      const page = rendered.queryByTestId("kubernetes-preferences-page");
+      const { discovered } = discover.querySingleElement(
+        "preference-page",
+        "kubernetes-page",
+      );
 
-      expect(page).toBeNull();
+      expect(discovered).toBeNull();
     });
 
     describe("when navigating to kubernetes preferences using navigation", () => {
@@ -57,9 +65,12 @@ describe("preferences - navigation to kubernetes preferences", () => {
       });
 
       it("shows kubernetes preferences", () => {
-        const page = rendered.getByTestId("kubernetes-preferences-page");
+        const { discovered } = discover.getSingleElement(
+          "preference-page",
+          "kubernetes-page",
+        );
 
-        expect(page).not.toBeNull();
+        expect(discovered).not.toBeNull();
       });
     });
   });
diff --git a/src/features/preferences/navigation-to-proxy-preferences.test.ts b/src/features/preferences/navigation-to-proxy-preferences.test.ts
index 976e9058ef..2372b78187 100644
--- a/src/features/preferences/navigation-to-proxy-preferences.test.ts
+++ b/src/features/preferences/navigation-to-proxy-preferences.test.ts
@@ -5,6 +5,8 @@
 import type { RenderResult } from "@testing-library/react";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import type { Discover } from "../../renderer/components/test-utils/discovery-of-html-elements";
+import { discoverFor } from "../../renderer/components/test-utils/discovery-of-html-elements";
 
 describe("preferences - navigation to proxy preferences", () => {
   let applicationBuilder: ApplicationBuilder;
@@ -15,6 +17,7 @@ describe("preferences - navigation to proxy preferences", () => {
 
   describe("given in preferences, when rendered", () => {
     let rendered: RenderResult;
+    let discover: Discover;
 
     beforeEach(async () => {
       applicationBuilder.beforeWindowStart(() => {
@@ -22,6 +25,7 @@ describe("preferences - navigation to proxy preferences", () => {
       });
 
       rendered = await applicationBuilder.render();
+      discover = discoverFor(() => rendered);
     });
 
     it("renders", () => {
@@ -29,9 +33,12 @@ describe("preferences - navigation to proxy preferences", () => {
     });
 
     it("does not show proxy preferences yet", () => {
-      const page = rendered.queryByTestId("proxy-preferences-page");
+      const { discovered } = discover.querySingleElement(
+        "preference-page",
+        "proxy-page",
+      );
 
-      expect(page).toBeNull();
+      expect(discovered).toBeNull();
     });
 
     describe("when navigating to proxy preferences using navigation", () => {
@@ -44,9 +51,12 @@ describe("preferences - navigation to proxy preferences", () => {
       });
 
       it("shows proxy preferences", () => {
-        const page = rendered.getByTestId("proxy-preferences-page");
+        const { discovered } = discover.getSingleElement(
+          "preference-page",
+          "proxy-page",
+        );
 
-        expect(page).not.toBeNull();
+        expect(discovered).not.toBeNull();
       });
     });
   });
diff --git a/src/features/preferences/navigation-to-telemetry-preferences.test.tsx b/src/features/preferences/navigation-to-telemetry-preferences.test.tsx
index c4a76bed81..71d6900f6e 100644
--- a/src/features/preferences/navigation-to-telemetry-preferences.test.tsx
+++ b/src/features/preferences/navigation-to-telemetry-preferences.test.tsx
@@ -6,9 +6,11 @@ import type { RenderResult } from "@testing-library/react";
 import React from "react";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import navigateToTelemetryPreferencesInjectable from "../../common/front-end-routing/routes/preferences/telemetry/navigate-to-telemetry-preferences.injectable";
-import sentryDnsUrlInjectable from "../../renderer/components/+preferences/sentry-dns-url.injectable";
+import navigateToTelemetryPreferencesInjectable from "./common/navigate-to-telemetry-preferences.injectable";
+import sentryDataSourceNameInjectable from "../../common/vars/sentry-dsn-url.injectable";
 import type { FakeExtensionOptions } from "../../renderer/components/test-utils/get-extension-fake";
+import type { Discover } from "../../renderer/components/test-utils/discovery-of-html-elements";
+import { discoverFor } from "../../renderer/components/test-utils/discovery-of-html-elements";
 
 describe("preferences - navigation to telemetry preferences", () => {
   let builder: ApplicationBuilder;
@@ -19,6 +21,7 @@ describe("preferences - navigation to telemetry preferences", () => {
 
   describe("given in preferences, when rendered", () => {
     let rendered: RenderResult;
+    let discover: Discover;
 
     beforeEach(async () => {
       builder.beforeWindowStart(() => {
@@ -26,6 +29,8 @@ describe("preferences - navigation to telemetry preferences", () => {
       });
 
       rendered = await builder.render();
+
+      discover = discoverFor(() => rendered);
     });
 
     it("renders", () => {
@@ -33,15 +38,21 @@ describe("preferences - navigation to telemetry preferences", () => {
     });
 
     it("does not show telemetry preferences yet", () => {
-      const page = rendered.queryByTestId("telemetry-preferences-page");
+      const { discovered } = discover.querySingleElement(
+        "preference-page",
+        "telemetry-page",
+      );
 
-      expect(page).toBeNull();
+      expect(discovered).toBeNull();
     });
 
     it("does not show link for telemetry preferences", () => {
-      const actual = rendered.queryByTestId("tab-link-for-telemetry");
+      const { discovered } = discover.querySingleElement(
+        "preference-tab-link",
+        "telemetry",
+      );
 
-      expect(actual).toBeNull();
+      expect(discovered).toBeNull();
     });
 
     describe("when extension with telemetry preference items gets enabled", () => {
@@ -56,9 +67,12 @@ describe("preferences - navigation to telemetry preferences", () => {
       });
 
       it("shows link for telemetry preferences", () => {
-        const actual = rendered.getByTestId("tab-link-for-telemetry");
+        const { discovered } = discover.getSingleElement(
+          "preference-tab-link",
+          "telemetry",
+        );
 
-        expect(actual).not.toBeNull();
+        expect(discovered).not.toBeNull();
       });
 
       describe("when clicking link to telemetry preferences from navigation", () => {
@@ -71,17 +85,21 @@ describe("preferences - navigation to telemetry preferences", () => {
         });
 
         it("shows telemetry preferences", () => {
-          const page = rendered.getByTestId("telemetry-preferences-page");
+          const { discovered } = discover.getSingleElement(
+            "preference-page",
+            "telemetry-page",
+          );
 
-          expect(page).not.toBeNull();
+          expect(discovered).not.toBeNull();
         });
 
         it("shows extension telemetry preference items", () => {
-          const actual = rendered.getByTestId(
-            "telemetry-preference-item-for-some-telemetry-preference-item-id",
-          );
+          const { attributeValues } =
+            discover.queryAllElements("preference-item");
 
-          expect(actual).not.toBeNull();
+          expect(attributeValues).toEqual([
+            "preference-item-for-extension-some-test-extension-name-item-some-telemetry-preference-item-id",
+          ]);
         });
       });
     });
@@ -92,6 +110,13 @@ describe("preferences - navigation to telemetry preferences", () => {
         name: "some-test-extension-name",
 
         rendererOptions: {
+          appPreferenceTabs: [
+            {
+              title: "irrelevant",
+              id: "not-telemetry",
+            },
+          ],
+
           appPreferences: [
             {
               title: "irrelevant",
@@ -103,22 +128,28 @@ describe("preferences - navigation to telemetry preferences", () => {
         },
       });
 
-      const actual = rendered.queryByTestId("tab-link-for-telemetry");
+      const { discovered } = discover.querySingleElement(
+        "preference-tab-link",
+        "telemetry",
+      );
 
-      expect(actual).toBeNull();
+      expect(discovered).toBeNull();
     });
   });
 
   describe("given URL for Sentry DNS, when navigating to preferences", () => {
     let rendered: RenderResult;
+    let discover: Discover;
 
     beforeEach(async () => {
       builder.beforeWindowStart((windowDi) => {
-        windowDi.override(sentryDnsUrlInjectable, () => "some-sentry-dns-url");
+        windowDi.override(sentryDataSourceNameInjectable, () => "some-sentry-dns-url");
       });
 
       rendered = await builder.render();
 
+      discover = discoverFor(() => rendered);
+
       builder.preferences.navigate();
     });
 
@@ -132,23 +163,28 @@ describe("preferences - navigation to telemetry preferences", () => {
       });
 
       it("allows configuration of automatic error reporting", () => {
-        const actual = rendered.getByTestId("telemetry-preferences-for-automatic-error-reporting");
+        const { attributeValues } = discover.queryAllElements(
+          "preference-item",
+        );
 
-        expect(actual).not.toBeNull();
+        expect(attributeValues).toEqual(["automatic-error-reporting"]);
       });
     });
   });
 
   describe("given no URL for Sentry DNS, when navigating to telemetry preferences", () => {
     let rendered: RenderResult;
+    let discover: Discover;
 
     beforeEach(async () => {
       builder.beforeWindowStart((windowDi) => {
-        windowDi.override(sentryDnsUrlInjectable, () => null);
+        windowDi.override(sentryDataSourceNameInjectable, () => null);
       });
 
       rendered = await builder.render();
 
+      discover = discoverFor(() => rendered);
+
       const windowDi = builder.applicationWindow.only.di;
 
       const navigateToTelemetryPreferences = windowDi.inject(navigateToTelemetryPreferencesInjectable);
@@ -161,9 +197,11 @@ describe("preferences - navigation to telemetry preferences", () => {
     });
 
     it("does not allow configuration of automatic error reporting", () => {
-      const actual = rendered.queryByTestId("telemetry-preferences-for-automatic-error-reporting");
+      const { attributeValues } = discover.queryAllElements(
+        "preference-item",
+      );
 
-      expect(actual).toBeNull();
+      expect(attributeValues).toEqual([]);
     });
   });
 });
diff --git a/src/features/preferences/navigation-to-terminal-preferences.test.ts b/src/features/preferences/navigation-to-terminal-preferences.test.ts
index e7fbb9c4b9..3023852481 100644
--- a/src/features/preferences/navigation-to-terminal-preferences.test.ts
+++ b/src/features/preferences/navigation-to-terminal-preferences.test.ts
@@ -5,6 +5,8 @@
 import type { RenderResult } from "@testing-library/react";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import type { Discover } from "../../renderer/components/test-utils/discovery-of-html-elements";
+import { discoverFor } from "../../renderer/components/test-utils/discovery-of-html-elements";
 
 describe("preferences - navigation to terminal preferences", () => {
   let applicationBuilder: ApplicationBuilder;
@@ -15,6 +17,7 @@ describe("preferences - navigation to terminal preferences", () => {
 
   describe("given in preferences, when rendered", () => {
     let rendered: RenderResult;
+    let discover: Discover;
 
     beforeEach(async () => {
       applicationBuilder.beforeWindowStart(() => {
@@ -22,6 +25,8 @@ describe("preferences - navigation to terminal preferences", () => {
       });
 
       rendered = await applicationBuilder.render();
+
+      discover = discoverFor(() => rendered);
     });
 
     it("renders", () => {
@@ -29,9 +34,12 @@ describe("preferences - navigation to terminal preferences", () => {
     });
 
     it("does not show terminal preferences yet", () => {
-      const page = rendered.queryByTestId("terminal-preferences-page");
+      const { discovered } = discover.querySingleElement(
+        "preference-page",
+        "terminal-page",
+      );
 
-      expect(page).toBeNull();
+      expect(discovered).toBeNull();
     });
 
     describe("when navigating to terminal preferences using navigation", () => {
@@ -43,10 +51,14 @@ describe("preferences - navigation to terminal preferences", () => {
         expect(rendered.container).toMatchSnapshot();
       });
 
-      it("shows terminal preferences", () => {
-        const page = rendered.getByTestId("terminal-preferences-page");
 
-        expect(page).not.toBeNull();
+      it("shows terminal preferences", () => {
+        const { discovered } = discover.getSingleElement(
+          "preference-page",
+          "terminal-page",
+        );
+
+        expect(discovered).not.toBeNull();
       });
     });
   });
diff --git a/src/features/preferences/navigation-using-application-menu.test.ts b/src/features/preferences/navigation-using-application-menu.test.ts
index c78e546442..ae143fe468 100644
--- a/src/features/preferences/navigation-using-application-menu.test.ts
+++ b/src/features/preferences/navigation-using-application-menu.test.ts
@@ -6,40 +6,54 @@
 import type { RenderResult } from "@testing-library/react";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import type { Discover } from "../../renderer/components/test-utils/discovery-of-html-elements";
+import { discoverFor } from "../../renderer/components/test-utils/discovery-of-html-elements";
 
 describe("preferences - navigation using application menu", () => {
   let applicationBuilder: ApplicationBuilder;
   let rendered: RenderResult;
+  let discover: Discover;
 
   beforeEach(async () => {
     applicationBuilder = getApplicationBuilder();
 
     rendered = await applicationBuilder.render();
+    discover = discoverFor(() => rendered);
   });
 
   it("renders", () => {
     expect(rendered.container).toMatchSnapshot();
   });
 
-  it("does not show application preferences page yet", () => {
-    const actual = rendered.queryByTestId("application-preferences-page");
+  it("does not show application preferences yet", () => {
+    const { discovered } = discover.querySingleElement(
+      "preference-page",
+      "application-page",
+    );
 
-    expect(actual).toBeNull();
+    expect(discovered).toBeNull();
   });
 
   describe("when navigating to preferences using application menu", () => {
     beforeEach(() => {
-      applicationBuilder.applicationMenu.click("root.preferences");
+      applicationBuilder.applicationMenu.click(
+        "root",
+        "mac",
+        "navigate-to-preferences",
+      );
     });
 
     it("renders", () => {
       expect(rendered.container).toMatchSnapshot();
     });
 
-    it("shows application preferences page", () => {
-      const actual = rendered.getByTestId("application-preferences-page");
+    it("shows application preferences", () => {
+      const { discovered } = discover.getSingleElement(
+        "preference-page",
+        "application-page",
+      );
 
-      expect(actual).not.toBeNull();
+      expect(discovered).not.toBeNull();
     });
   });
 });
diff --git a/src/features/preferences/navigation-using-tray.test.ts b/src/features/preferences/navigation-using-tray.test.ts
index 065cc54f4b..e48dba482e 100644
--- a/src/features/preferences/navigation-using-tray.test.ts
+++ b/src/features/preferences/navigation-using-tray.test.ts
@@ -5,25 +5,32 @@
 import type { RenderResult } from "@testing-library/react";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import type { Discover } from "../../renderer/components/test-utils/discovery-of-html-elements";
+import { discoverFor } from "../../renderer/components/test-utils/discovery-of-html-elements";
 
 describe("show-about-using-tray", () => {
   let applicationBuilder: ApplicationBuilder;
   let rendered: RenderResult;
+  let discover: Discover;
 
   beforeEach(async () => {
     applicationBuilder = getApplicationBuilder();
 
     rendered = await applicationBuilder.render();
+    discover = discoverFor(() => rendered);
   });
 
   it("renders", () => {
     expect(rendered.baseElement).toMatchSnapshot();
   });
 
-  it("does not show application preferences page yet", () => {
-    const actual = rendered.queryByTestId("application-preferences-page");
+  it("does not show application preferences yet", () => {
+    const { discovered } = discover.querySingleElement(
+      "preference-page",
+      "application-page",
+    );
 
-    expect(actual).toBeNull();
+    expect(discovered).toBeNull();
   });
 
   describe("when navigating using tray", () => {
@@ -35,10 +42,13 @@ describe("show-about-using-tray", () => {
       expect(rendered.baseElement).toMatchSnapshot();
     });
 
-    it("shows application preferences page", () => {
-      const actual = rendered.getByTestId("application-preferences-page");
+    it("shows application preferences", () => {
+      const { discovered } = discover.getSingleElement(
+        "preference-page",
+        "application-page",
+      );
 
-      expect(actual).not.toBeNull();
+      expect(discovered).not.toBeNull();
     });
   });
 });
diff --git a/src/renderer/components/+preferences/close-preferences.injectable.ts b/src/features/preferences/renderer/close-preferences/close-preferences.injectable.ts
similarity index 75%
rename from src/renderer/components/+preferences/close-preferences.injectable.ts
rename to src/features/preferences/renderer/close-preferences/close-preferences.injectable.ts
index b85c2ae52a..57860c2f28 100644
--- a/src/renderer/components/+preferences/close-preferences.injectable.ts
+++ b/src/features/preferences/renderer/close-preferences/close-preferences.injectable.ts
@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import observableHistoryInjectable from "../../navigation/observable-history.injectable";
-import navigateToFrontPageInjectable from "../../../common/front-end-routing/navigate-to-front-page.injectable";
+import observableHistoryInjectable from "../../../../renderer/navigation/observable-history.injectable";
+import navigateToFrontPageInjectable from "../../../../common/front-end-routing/navigate-to-front-page.injectable";
 
 const closePreferencesInjectable = getInjectable({
   id: "close-preferences",
diff --git a/src/renderer/components/+preferences/app-preferences/app-preference-registration.ts b/src/features/preferences/renderer/compliance-for-legacy-extension-api/app-preference-registration.ts
similarity index 100%
rename from src/renderer/components/+preferences/app-preferences/app-preference-registration.ts
rename to src/features/preferences/renderer/compliance-for-legacy-extension-api/app-preference-registration.ts
diff --git a/src/renderer/components/+preferences/app-preference-tab/app-preference-tab-registration.ts b/src/features/preferences/renderer/compliance-for-legacy-extension-api/app-preference-tab-registration.ts
similarity index 99%
rename from src/renderer/components/+preferences/app-preference-tab/app-preference-tab-registration.ts
rename to src/features/preferences/renderer/compliance-for-legacy-extension-api/app-preference-tab-registration.ts
index d987e18b96..803e51130d 100644
--- a/src/renderer/components/+preferences/app-preference-tab/app-preference-tab-registration.ts
+++ b/src/features/preferences/renderer/compliance-for-legacy-extension-api/app-preference-tab-registration.ts
@@ -11,4 +11,3 @@ export interface AppPreferenceTabRegistration {
   orderNumber?: number;
   visible?: IComputedValue<boolean>;
 }
-
diff --git a/src/renderer/components/+preferences/extension-settings.tsx b/src/features/preferences/renderer/compliance-for-legacy-extension-api/extension-preference-block.tsx
similarity index 50%
rename from src/renderer/components/+preferences/extension-settings.tsx
rename to src/features/preferences/renderer/compliance-for-legacy-extension-api/extension-preference-block.tsx
index 277580a303..4eb72fe029 100644
--- a/src/renderer/components/+preferences/extension-settings.tsx
+++ b/src/features/preferences/renderer/compliance-for-legacy-extension-api/extension-preference-block.tsx
@@ -2,30 +2,26 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { SubTitle } from "../layout/sub-title";
-import type { AppPreferenceRegistration } from "./app-preferences/app-preference-registration";
-import type { DOMAttributes } from "react";
+import { SubTitle } from "../../../../renderer/components/layout/sub-title";
+import type { AppPreferenceRegistration } from "./app-preference-registration";
 import React from "react";
-import { cssNames } from "../../../renderer/utils";
 
-export interface ExtensionSettingsProps extends DOMAttributes<HTMLDivElement> {
-  setting: AppPreferenceRegistration;
-  size: "small" | "normal";
+export interface ExtensionSettingsProps {
+  registration: AppPreferenceRegistration;
 }
 
-export function ExtensionSettings({ setting, size, ...props }: ExtensionSettingsProps) {
+export function ExtensionPreferenceBlock({ registration }: ExtensionSettingsProps) {
   const {
     title,
     id,
     components: { Hint, Input },
-  } = setting;
+  } = registration;
 
   return (
     <React.Fragment>
       <section
         id={id}
-        className={cssNames(size)}
-        {...props}
+        className="small"
       >
         <SubTitle title={title} />
         <Input />
@@ -33,7 +29,7 @@ export function ExtensionSettings({ setting, size, ...props }: ExtensionSettings
           <Hint />
         </div>
       </section>
-      <hr className={cssNames(size)} />
+      <hr className="small" />
     </React.Fragment>
   );
 }
diff --git a/src/features/preferences/renderer/compliance-for-legacy-extension-api/registrator-for-preference-items.injectable.tsx b/src/features/preferences/renderer/compliance-for-legacy-extension-api/registrator-for-preference-items.injectable.tsx
new file mode 100644
index 0000000000..6a79f96c37
--- /dev/null
+++ b/src/features/preferences/renderer/compliance-for-legacy-extension-api/registrator-for-preference-items.injectable.tsx
@@ -0,0 +1,155 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { getInjectable } from "@ogre-tools/injectable";
+import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension";
+import { preferenceItemInjectionToken } from "../preference-items/preference-item-injection-token";
+import { extensionRegistratorInjectionToken } from "../../../../extensions/extension-loader/extension-registrator-injection-token";
+import { PreferencePageComponent } from "../preference-page-component";
+import { ExtensionPreferenceBlock } from "./extension-preference-block";
+import { computed } from "mobx";
+import { HorizontalLine } from "../../../../renderer/components/horizontal-line/horizontal-line";
+
+const registratorForPreferenceItemsInjectable = getInjectable({
+  id: "registrator-for-preference-items",
+
+  instantiate: () => (ext) => {
+    const extension = ext as LensRendererExtension;
+
+    const commonId = `preference-item-for-extension-${extension.sanitizedExtensionId}`;
+
+    const tabId = `${commonId}-primary-tab`;
+    const primaryTabInjectable = getInjectable({
+      id: tabId,
+
+      instantiate: () => ({
+        kind: "tab" as const,
+        id: tabId,
+        parentId: "extensions-tab-group",
+        pathId: extension.sanitizedExtensionId,
+        label: extension.name,
+        orderNumber: 10,
+      }),
+
+      injectionToken: preferenceItemInjectionToken,
+    });
+
+    const primaryPageId = `${commonId}-page`;
+    const primaryPageInjectable = getInjectable({
+      id: primaryPageId,
+
+      instantiate: () => ({
+        kind: "page" as const,
+        id: primaryPageId,
+        parentId: tabId,
+
+        Component: ({ children }: { children: React.ReactElement }) => (
+          <PreferencePageComponent
+            id={primaryPageId}
+            title={`${extension.name} preferences`}
+          >
+            {children}
+          </PreferencePageComponent>
+        ),
+
+        childSeparator: () => <HorizontalLine />,
+      }),
+
+      injectionToken: preferenceItemInjectionToken,
+    });
+
+    const additionalTabs = extension.appPreferenceTabs.map(
+      (registration) => {
+        const additionalTabId = `${commonId}-additional-tab-${registration.id}`;
+
+        return getInjectable({
+          id: additionalTabId,
+
+          instantiate: () => ({
+            kind: "tab" as const,
+            id: additionalTabId,
+            parentId: "general-tab-group",
+            pathId: `extension-${extension.sanitizedExtensionId}-${registration.id}`,
+            label: registration.title,
+            isShown: computed(() => registration.visible?.get() ?? true),
+            orderNumber: registration.orderNumber || 100,
+          }),
+
+          injectionToken: preferenceItemInjectionToken,
+        });
+      },
+    );
+
+    const additionalPages = extension.appPreferenceTabs.map(
+      (registration) => {
+        const additionalPageId = `${commonId}-additional-page-${registration.id}`;
+        const additionalTabId = `${commonId}-additional-tab-${registration.id}`;
+
+        return getInjectable({
+          id: additionalPageId,
+
+          instantiate: () => ({
+            kind: "page" as const,
+            id: additionalPageId,
+            parentId: additionalTabId,
+
+            Component: ({ children }: { children: React.ReactElement }) => (
+              <PreferencePageComponent
+                id={additionalPageId}
+                title={registration.title}
+              >
+                {children}
+              </PreferencePageComponent>
+            ),
+          }),
+
+          injectionToken: preferenceItemInjectionToken,
+        });
+      },
+    );
+
+    const items = extension.appPreferences.map((registration, i) => {
+      const itemId = `${commonId}-item-${registration.id ?? i}`;
+
+      return getInjectable({
+        id: itemId,
+
+        instantiate: () => ({
+          kind: "block" as const,
+          id: itemId,
+
+          // Note: Legacy extensions considered telemetry as magic string, and so does this code
+          parentId: registration.showInPreferencesTab
+            ? registration.showInPreferencesTab === "telemetry"
+              ? "telemetry-page"
+              : `${commonId}-additional-page-${registration.showInPreferencesTab}`
+            : primaryPageId,
+
+          orderNumber: i * 10,
+
+          Component: () => (
+            <ExtensionPreferenceBlock registration={registration} />
+          ),
+
+          childSeparator: () => <HorizontalLine />,
+        }),
+
+        injectionToken: preferenceItemInjectionToken,
+      });
+    });
+
+    return [
+      primaryTabInjectable,
+      ...additionalTabs,
+      primaryPageInjectable,
+      ...additionalPages,
+      ...items,
+    ];
+  },
+
+  injectionToken: extensionRegistratorInjectionToken,
+});
+
+export default registratorForPreferenceItemsInjectable;
diff --git a/src/features/preferences/renderer/preference-items/application/application-preference-page.injectable.tsx b/src/features/preferences/renderer/preference-items/application/application-preference-page.injectable.tsx
new file mode 100644
index 0000000000..cdf1b2048f
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/application/application-preference-page.injectable.tsx
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { PreferenceItemComponent, PreferencePage } from "../preference-item-injection-token";
+import { preferenceItemInjectionToken } from "../preference-item-injection-token";
+import { PreferencePageComponent } from "../../preference-page-component";
+import { HorizontalLine } from "../../../../../renderer/components/horizontal-line/horizontal-line";
+import React from "react";
+
+const ApplicationPage: PreferenceItemComponent<PreferencePage> = ({ children, item }) => (
+  <PreferencePageComponent title="Application" id={item.id}>
+    {children}
+  </PreferencePageComponent>
+);
+
+const applicationPreferencePageInjectable = getInjectable({
+  id: "application-preference-page",
+
+  instantiate: () => ({
+    kind: "page" as const,
+    id: "application-page",
+    parentId: "application-tab",
+    Component: ApplicationPage,
+    childSeparator: () => <HorizontalLine />,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default applicationPreferencePageInjectable;
diff --git a/src/features/preferences/renderer/preference-items/application/application-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/application/application-preference-tab.injectable.ts
new file mode 100644
index 0000000000..0091dd2023
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/application/application-preference-tab.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../preference-item-injection-token";
+
+const applicationPreferenceTabInjectable = getInjectable({
+  id: "application-preference-tab",
+
+  instantiate: () => ({
+    kind: "tab" as const,
+    id: "application-tab",
+    parentId: "general-tab-group" as const,
+    pathId: "app",
+    label: "App",
+    orderNumber: 10,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default applicationPreferenceTabInjectable;
diff --git a/src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry-preference-block.injectable.ts
new file mode 100644
index 0000000000..edda55f3de
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { ExtensionInstallRegistry } from "./extension-install-registry";
+
+const extensionInstallRegistryPreferenceBlockInjectable = getInjectable({
+  id: "extension-install-registry-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "extension-install-registry",
+    parentId: "application-page",
+    orderNumber: 20,
+    Component: ExtensionInstallRegistry,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default extensionInstallRegistryPreferenceBlockInjectable;
diff --git a/src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry.tsx b/src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry.tsx
new file mode 100644
index 0000000000..ce6aed0a5f
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry.tsx
@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { Select } from "../../../../../../renderer/components/select";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import { defaultExtensionRegistryUrl, defaultExtensionRegistryUrlLocation } from "../../../../../../common/user-store/preferences-helpers";
+import { Input } from "../../../../../../renderer/components/input";
+import { isUrl } from "../../../../../../renderer/components/input/input_validators";
+import type { UserStore } from "../../../../../../common/user-store";
+import { runInAction } from "mobx";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { observer } from "mobx-react";
+
+interface Dependencies {
+  userStore: UserStore;
+}
+
+const extensionInstallRegistryOptions = [
+  {
+    value: "default",
+    label: "Default Url",
+  },
+  {
+    value: "npmrc",
+    label: "Global .npmrc file's Url",
+  },
+  {
+    value: "custom",
+    label: "Custom Url",
+  },
+] as const;
+
+const NonInjectedExtensionInstallRegistry = observer(({ userStore }: Dependencies) => {
+  const [customUrl, setCustomUrl] = React.useState(userStore.extensionRegistryUrl.customUrl || "");
+
+  return (
+    <section id="extensionRegistryUrl">
+      <SubTitle title="Extension Install Registry" />
+      <Select
+        id="extension-install-registry-input"
+        options={extensionInstallRegistryOptions}
+        value={userStore.extensionRegistryUrl.location}
+        onChange={(value) =>
+          runInAction(() => {
+            userStore.extensionRegistryUrl.location =
+              value?.value ?? defaultExtensionRegistryUrlLocation;
+
+            if (userStore.extensionRegistryUrl.location === "custom") {
+              userStore.extensionRegistryUrl.customUrl = "";
+            }
+          })
+        }
+        themeName="lens"
+      />
+      <p className="mt-4 mb-5 leading-relaxed">
+        {
+          "This setting is to change the registry URL for installing extensions by name. "
+        }
+        {`If you are unable to access the default registry (${defaultExtensionRegistryUrl}) you can change it in your `}
+        <b>.npmrc</b>
+        {" file or in the input below."}
+      </p>
+
+      <Input
+        theme="round-black"
+        validators={isUrl}
+        value={customUrl}
+        onChange={setCustomUrl}
+        onBlur={() => (userStore.extensionRegistryUrl.customUrl = customUrl)}
+        placeholder="Custom Extension Registry URL..."
+        disabled={userStore.extensionRegistryUrl.location !== "custom"}
+      />
+    </section>
+  );
+});
+
+export const ExtensionInstallRegistry = withInjectables<Dependencies>(
+  NonInjectedExtensionInstallRegistry,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/application/start-up/start-up-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/application/start-up/start-up-preference-block.injectable.ts
new file mode 100644
index 0000000000..2db579bf6e
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/application/start-up/start-up-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { StartUp } from "./start-up";
+
+const startUpPreferenceBlockInjectable = getInjectable({
+  id: "start-up-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "start-up",
+    parentId: "application-page",
+    orderNumber: 30,
+    Component: StartUp,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default startUpPreferenceBlockInjectable;
diff --git a/src/features/preferences/renderer/preference-items/application/start-up/start-up.tsx b/src/features/preferences/renderer/preference-items/application/start-up/start-up.tsx
new file mode 100644
index 0000000000..427705cca1
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/application/start-up/start-up.tsx
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { Switch } from "../../../../../../renderer/components/switch";
+import { observer } from "mobx-react";
+
+interface Dependencies {
+  userStore: UserStore;
+}
+
+const NonInjectedStartUp = observer(({ userStore }: Dependencies) => (
+  <section id="other">
+    <SubTitle title="Start-up" />
+    <Switch
+      checked={userStore.openAtLogin}
+      onChange={() => (userStore.openAtLogin = !userStore.openAtLogin)}
+    >
+      Automatically start Lens on login
+    </Switch>
+  </section>
+));
+
+export const StartUp = withInjectables<Dependencies>(
+  NonInjectedStartUp,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/application/theme/theme-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/application/theme/theme-preference-block.injectable.ts
new file mode 100644
index 0000000000..285b068d62
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/application/theme/theme-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { Theme } from "./theme";
+
+const themePreferenceBlockInjectable = getInjectable({
+  id: "theme-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "theme",
+    parentId: "application-page",
+    orderNumber: 10,
+    Component: Theme,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default themePreferenceBlockInjectable;
diff --git a/src/features/preferences/renderer/preference-items/application/theme/theme.tsx b/src/features/preferences/renderer/preference-items/application/theme/theme.tsx
new file mode 100644
index 0000000000..851cc638d4
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/application/theme/theme.tsx
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { Select } from "../../../../../../renderer/components/select";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import { observer } from "mobx-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import type { ThemeStore } from "../../../../../../renderer/themes/store";
+import { defaultThemeId } from "../../../../../../common/vars";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import themeStoreInjectable from "../../../../../../renderer/themes/store.injectable";
+
+interface Dependencies {
+  userStore: UserStore;
+  themeStore: ThemeStore;
+}
+
+const NonInjectedTheme = observer(({ userStore, themeStore }: Dependencies) => {
+  const themeOptions = [
+    {
+      value: "system", // TODO: replace with a sentinal value that isn't string (and serialize it differently)
+      label: "Sync with computer",
+    },
+    ...Array.from(themeStore.themes, ([themeId, { name }]) => ({
+      value: themeId,
+      label: name,
+    })),
+  ];
+
+  return (
+    <section id="appearance">
+      <SubTitle title="Theme" />
+      <Select
+        id="theme-input"
+        options={themeOptions}
+        value={userStore.colorTheme}
+        onChange={(value) =>
+          (userStore.colorTheme = value?.value ?? defaultThemeId)
+        }
+        themeName="lens"
+      />
+    </section>
+  );
+});
+
+export const Theme = withInjectables<Dependencies>(
+  NonInjectedTheme,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+      themeStore: di.inject(themeStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/application/timezone/timezone-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/application/timezone/timezone-preference-block.injectable.ts
new file mode 100644
index 0000000000..5357341f9a
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/application/timezone/timezone-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { Timezone } from "./timezone";
+
+const timezonePreferenceBlockInjectable = getInjectable({
+  id: "timezone-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "timezone",
+    parentId: "application-page",
+    orderNumber: 60,
+    Component: Timezone,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default timezonePreferenceBlockInjectable;
diff --git a/src/features/preferences/renderer/preference-items/application/timezone/timezone.tsx b/src/features/preferences/renderer/preference-items/application/timezone/timezone.tsx
new file mode 100644
index 0000000000..137d92531c
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/application/timezone/timezone.tsx
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { Select } from "../../../../../../renderer/components/select";
+import { defaultLocaleTimezone } from "../../../../../../common/user-store/preferences-helpers";
+import moment from "moment-timezone";
+import { observer } from "mobx-react";
+
+interface Dependencies {
+  userStore: UserStore;
+}
+
+const timezoneOptions = moment.tz.names()
+  .map(timezone => ({
+    value: timezone,
+    label: timezone.replace("_", " "),
+  }));
+
+
+const NonInjectedTimezone = observer(({ userStore }: Dependencies) => (
+  <section id="locale">
+    <SubTitle title="Locale Timezone" />
+    <Select
+      id="timezone-input"
+      options={timezoneOptions}
+      value={userStore.localeTimezone}
+      onChange={value => userStore.localeTimezone = value?.value ?? defaultLocaleTimezone}
+      themeName="lens"
+    />
+  </section>
+
+));
+
+export const Timezone = withInjectables<Dependencies>(
+  NonInjectedTimezone,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/current-preference-tab-composite.injectable.ts b/src/features/preferences/renderer/preference-items/current-preference-tab-composite.injectable.ts
new file mode 100644
index 0000000000..5930aaa7e4
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/current-preference-tab-composite.injectable.ts
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import type { PreferenceTab, PreferenceItemTypes } from "./preference-item-injection-token";
+import type { Composite } from "../../../../common/utils/composite/get-composite/get-composite";
+import { filter, map } from "lodash/fp";
+import { pipeline } from "@ogre-tools/fp";
+import { getCompositeNormalization } from "../../../../common/utils/composite/get-composite-normalization/get-composite-normalization";
+import preferencesCompositeInjectable from "./preferences-composite.injectable";
+import type { PreferenceTabsRoot } from "./preference-tab-root";
+import currentPreferenceTabIdInjectable from "./current-preference-tab-id.injectable";
+
+const currentPreferenceTabCompositeInjectable = getInjectable({
+  id: "current-preference-page-composite",
+
+  instantiate: (di) => {
+    const currentTabId = di.inject(currentPreferenceTabIdInjectable);
+    const preferencesComposite = di.inject(preferencesCompositeInjectable);
+
+    return computed(() => {
+      const tabId = currentTabId.get();
+
+      const tabComposites = pipeline(
+        getCompositeNormalization(preferencesComposite.get()),
+        map(([, composite]) => composite),
+        filter(isPreferenceTab),
+        filter(hasMatchingPathId(tabId)),
+      );
+
+      if (tabComposites.length === 0) {
+        return undefined;
+      }
+
+      return tabComposites[0];
+    });
+  },
+});
+
+const isPreferenceTab = (
+  composite: Composite<PreferenceItemTypes | PreferenceTabsRoot>,
+): composite is Composite<PreferenceTab> => composite.value.kind === "tab";
+
+const hasMatchingPathId =
+  (preferenceTabId: string) =>
+    ({ value: { pathId }}: Composite<PreferenceTab>) =>
+      pathId === preferenceTabId;
+
+export default currentPreferenceTabCompositeInjectable;
diff --git a/src/features/preferences/renderer/preference-items/current-preference-tab-id.injectable.ts b/src/features/preferences/renderer/preference-items/current-preference-tab-id.injectable.ts
new file mode 100644
index 0000000000..cdac5905a4
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/current-preference-tab-id.injectable.ts
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import preferencesRouteInjectable from "../../common/preferences-route.injectable";
+import routePathParametersInjectable from "../../../../renderer/routes/route-path-parameters.injectable";
+import preferencesRouteForLegacyExtensionsInjectable from "../../common/preferences-route-for-legacy-extensions.injectable";
+
+const currentPreferenceTabIdInjectable = getInjectable({
+  id: "current-preference-tab-id",
+
+  instantiate: (di) => {
+    const preferencesRoute = di.inject(preferencesRouteInjectable);
+    const preferencesRouteForLegacyExtensions = di.inject(preferencesRouteForLegacyExtensionsInjectable);
+
+    const nonLegacyRoutePathParameters = di.inject(
+      routePathParametersInjectable,
+      preferencesRoute,
+    );
+
+    const legacyRoutePathParameters = di.inject(
+      routePathParametersInjectable,
+      preferencesRouteForLegacyExtensions,
+    );
+
+    return computed(() => {
+      const nonLegacyPreferenceTabId = nonLegacyRoutePathParameters.get().preferenceTabId;
+
+      if (nonLegacyPreferenceTabId) {
+        return nonLegacyPreferenceTabId;
+      }
+
+      const legacyParameters = legacyRoutePathParameters.get();
+
+      if (legacyParameters.extensionId) {
+        if (legacyParameters.preferenceTabId) {
+          return `extension-${legacyParameters.extensionId}-${legacyParameters.preferenceTabId}`;
+        }
+
+        return legacyParameters.extensionId;
+      }
+
+      return "app";
+    });
+  },
+});
+
+export default currentPreferenceTabIdInjectable;
diff --git a/src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family-preference-block.injectable.ts
new file mode 100644
index 0000000000..6db49581f7
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { EditorFontFamily } from "./editor-font-family";
+
+const editorFontFamilyPreferenceBlockInjectable = getInjectable({
+  id: "editor-font-family-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "editor-font-family",
+    parentId: "editor-page",
+    orderNumber: 50,
+    Component: EditorFontFamily,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default editorFontFamilyPreferenceBlockInjectable;
diff --git a/src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family.tsx b/src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family.tsx
new file mode 100644
index 0000000000..50e3989ed6
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family.tsx
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { Input } from "../../../../../../renderer/components/input";
+import { observer } from "mobx-react";
+
+interface Dependencies {
+  userStore: UserStore;
+}
+
+const NonInjectedEditorFontFamily = observer(({ userStore: { editorConfiguration }}: Dependencies) => (
+  <section>
+    <SubTitle title="Font family" />
+    <Input
+      theme="round-black"
+      type="text"
+      value={editorConfiguration.fontFamily}
+      onChange={value => editorConfiguration.fontFamily = value}
+    />
+  </section>
+));
+
+export const EditorFontFamily = withInjectables<Dependencies>(
+  NonInjectedEditorFontFamily,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size-preference-block.injectable.ts
new file mode 100644
index 0000000000..c61250cbda
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { EditorFontSize } from "./editor-font-size";
+
+const editorFontSizePreferenceBlockInjectable = getInjectable({
+  id: "editor-font-size-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "editor-font-size",
+    parentId: "editor-page",
+    orderNumber: 40,
+    Component: EditorFontSize,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default editorFontSizePreferenceBlockInjectable;
diff --git a/src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size.tsx b/src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size.tsx
new file mode 100644
index 0000000000..7fe83ec6aa
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size.tsx
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { Input, InputValidators } from "../../../../../../renderer/components/input";
+import { observer } from "mobx-react";
+
+interface Dependencies {
+  userStore: UserStore;
+}
+
+const NonInjectedEditorFontSize = observer(({ userStore: { editorConfiguration }}: Dependencies) => (
+  <section>
+    <SubTitle title="Font size" />
+    <Input
+      theme="round-black"
+      type="number"
+      min={10}
+      validators={InputValidators.isNumber}
+      value={editorConfiguration.fontSize.toString()}
+      onChange={value => editorConfiguration.fontSize = Number(value)}
+    />
+  </section>
+));
+
+export const EditorFontSize = withInjectables<Dependencies>(
+  NonInjectedEditorFontSize,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/editor/editor-preference-page.injectable.tsx b/src/features/preferences/renderer/preference-items/editor/editor-preference-page.injectable.tsx
new file mode 100644
index 0000000000..3d075d6f22
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/editor/editor-preference-page.injectable.tsx
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { PreferenceItemComponent, PreferencePage } from "../preference-item-injection-token";
+import { preferenceItemInjectionToken } from "../preference-item-injection-token";
+import { PreferencePageComponent } from "../../preference-page-component";
+import React from "react";
+
+const EditorPage: PreferenceItemComponent<PreferencePage> = ({ children, item }) => (
+  <PreferencePageComponent title="Editor" id={item.id}>
+    {children}
+  </PreferencePageComponent>
+);
+
+const editorPreferencePageInjectable = getInjectable({
+  id: "editor-preference-page",
+
+  instantiate: () => ({
+    kind: "page" as const,
+    id: "editor-page",
+    parentId: "editor-tab",
+    Component: EditorPage,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default editorPreferencePageInjectable;
diff --git a/src/features/preferences/renderer/preference-items/editor/editor-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/editor/editor-preference-tab.injectable.ts
new file mode 100644
index 0000000000..c1dc4a29c0
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/editor/editor-preference-tab.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../preference-item-injection-token";
+
+const editorPreferenceTabInjectable = getInjectable({
+  id: "editor-preference-tab",
+
+  instantiate: () => ({
+    kind: "tab" as const,
+    id: "editor-tab",
+    parentId: "general-tab-group" as const,
+    pathId: "editor",
+    label: "Editor",
+    orderNumber: 40,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default editorPreferenceTabInjectable;
diff --git a/src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers-preference-block.injectable.ts
new file mode 100644
index 0000000000..104e0db62a
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { LineNumbers } from "./line-numbers";
+
+const lineNumbersPreferenceBlockInjectable = getInjectable({
+  id: "line-numbers-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "line-numbers",
+    parentId: "editor-page",
+    orderNumber: 20,
+    Component: LineNumbers,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default lineNumbersPreferenceBlockInjectable;
diff --git a/src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers.tsx b/src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers.tsx
new file mode 100644
index 0000000000..10cc508baa
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers.tsx
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { Select } from "../../../../../../renderer/components/select";
+import { defaultEditorConfig } from "../../../../../../common/user-store/preferences-helpers";
+import { capitalize } from "lodash/fp";
+import { observer } from "mobx-react";
+
+interface Dependencies {
+  userStore: UserStore;
+}
+
+const lineNumberOptions = ([
+  "on",
+  "off",
+  "relative",
+  "interval",
+] as const).map(lineNumbers => ({
+  value: lineNumbers,
+  label: capitalize(lineNumbers),
+}));
+
+const NonInjectedLineNumbers = observer(({ userStore: { editorConfiguration }}: Dependencies) => (
+  <section>
+    <SubTitle title="Line numbers"/>
+    <Select
+      id="editor-line-numbers-input"
+      options={lineNumberOptions}
+      value={editorConfiguration.lineNumbers}
+      onChange={option => editorConfiguration.lineNumbers = option?.value ?? defaultEditorConfig.lineNumbers}
+      themeName="lens"
+    />
+  </section>
+
+));
+
+export const LineNumbers = withInjectables<Dependencies>(
+  NonInjectedLineNumbers,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/editor/minimap/minimap-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/editor/minimap/minimap-preference-block.injectable.ts
new file mode 100644
index 0000000000..90d34aba7e
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/editor/minimap/minimap-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { Minimap } from "./minimap";
+
+const minimapPreferenceBlockInjectable = getInjectable({
+  id: "minimap-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "minimap",
+    parentId: "editor-page",
+    orderNumber: 10,
+    Component: Minimap,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default minimapPreferenceBlockInjectable;
diff --git a/src/features/preferences/renderer/preference-items/editor/minimap/minimap.tsx b/src/features/preferences/renderer/preference-items/editor/minimap/minimap.tsx
new file mode 100644
index 0000000000..9ca1dc9dd3
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/editor/minimap/minimap.tsx
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { Switch } from "../../../../../../renderer/components/switch";
+import { SubHeader } from "../../../../../../renderer/components/layout/sub-header";
+import { Select } from "../../../../../../renderer/components/select";
+import { observer } from "mobx-react";
+
+interface Dependencies {
+  userStore: UserStore;
+}
+
+const minimapPositionOptions = (["left", "right"] as const)
+  .map(side => ({
+    value: side,
+    label: side,
+  }));
+
+
+const NonInjectedMinimap = observer(({ userStore: { editorConfiguration }}: Dependencies) => (
+  <section>
+    <SubTitle title="Minimap"/>
+
+    <div className="flex gaps justify-space-between">
+      <div className="flex gaps align-center">
+        <Switch
+          checked={editorConfiguration.minimap.enabled}
+          onChange={() => editorConfiguration.minimap.enabled = !editorConfiguration.minimap.enabled}
+        >
+          Show minimap
+        </Switch>
+      </div>
+      <div className="flex gaps align-center">
+        <SubHeader compact>Position</SubHeader>
+        <Select
+          id="minimap-input"
+          themeName="lens"
+          options={minimapPositionOptions}
+          value={editorConfiguration.minimap.side}
+          onChange={option => editorConfiguration.minimap.side = option?.value}
+        />
+      </div>
+    </div>
+  </section>
+));
+
+export const Minimap = withInjectables<Dependencies>(
+  NonInjectedMinimap,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/editor/tab-size/tab-size-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/editor/tab-size/tab-size-preference-block.injectable.ts
new file mode 100644
index 0000000000..11bcae8440
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/editor/tab-size/tab-size-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { TabSize } from "./tab-size";
+
+const tabSizePreferenceBlockInjectable = getInjectable({
+  id: "tab-size-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "tab-size",
+    parentId: "editor-page",
+    orderNumber: 30,
+    Component: TabSize,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default tabSizePreferenceBlockInjectable;
diff --git a/src/features/preferences/renderer/preference-items/editor/tab-size/tab-size.tsx b/src/features/preferences/renderer/preference-items/editor/tab-size/tab-size.tsx
new file mode 100644
index 0000000000..575044a954
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/editor/tab-size/tab-size.tsx
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { Input, InputValidators } from "../../../../../../renderer/components/input";
+import { observer } from "mobx-react";
+
+interface Dependencies {
+  userStore: UserStore;
+}
+
+const NonInjectedTabSize = observer(({ userStore: { editorConfiguration }}: Dependencies) => (
+  <section>
+    <SubTitle title="Tab size" />
+    <Input
+      theme="round-black"
+      type="number"
+      min={1}
+      validators={InputValidators.isNumber}
+      value={editorConfiguration.tabSize.toString()}
+      onChange={value => editorConfiguration.tabSize = Number(value)}
+    />
+  </section>
+));
+
+export const TabSize = withInjectables<Dependencies>(
+  NonInjectedTabSize,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts b/src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts
new file mode 100644
index 0000000000..1a5fdb6645
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "./preference-item-injection-token";
+
+const extensionsPreferenceTabGroupInjectable = getInjectable({
+  id: "extensions-preference-tab-group",
+
+  instantiate: () => ({
+    kind: "tab-group" as const,
+    id: "extensions-tab-group",
+    parentId: "preference-tabs" as const,
+    label: "Extensions",
+    orderNumber: 20,
+    iconName: "extension",
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default extensionsPreferenceTabGroupInjectable;
diff --git a/src/features/preferences/renderer/preference-items/general-preference-tab-group.injectable.ts b/src/features/preferences/renderer/preference-items/general-preference-tab-group.injectable.ts
new file mode 100644
index 0000000000..fe46026aa8
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/general-preference-tab-group.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "./preference-item-injection-token";
+
+const generalPreferenceTabGroupInjectable = getInjectable({
+  id: "general-preference-tab-group",
+
+  instantiate: () => ({
+    kind: "tab-group" as const,
+    id: "general-tab-group",
+    parentId: "preference-tabs" as const,
+    label: "Preferences",
+    orderNumber: 10,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default generalPreferenceTabGroupInjectable;
diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync-preference-block.injectable.ts
new file mode 100644
index 0000000000..ec4556c1b9
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { KubeconfigSync } from "./kubeconfig-sync";
+
+const kubeconfigSyncPreferenceBlockInjectable = getInjectable({
+  id: "kubeconfig-sync-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "kubeconfig-sync",
+    parentId: "kubernetes-page",
+    orderNumber: 20,
+    Component: KubeconfigSync,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default kubeconfigSyncPreferenceBlockInjectable;
diff --git a/src/renderer/components/+preferences/kubeconfig-syncs.tsx b/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync.tsx
similarity index 81%
rename from src/renderer/components/+preferences/kubeconfig-syncs.tsx
rename to src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync.tsx
index a6a6fc1d10..6d0186aa8e 100644
--- a/src/renderer/components/+preferences/kubeconfig-syncs.tsx
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync.tsx
@@ -7,17 +7,17 @@ import fse from "fs-extra";
 import { computed, makeObservable, observable, reaction } from "mobx";
 import { disposeOnUnmount, observer } from "mobx-react";
 import React from "react";
-import { Notice } from "../+extensions/notice";
-import type { KubeconfigSyncEntry, KubeconfigSyncValue, UserStore } from "../../../common/user-store";
-import { iter, tuple } from "../../utils";
-import { SubTitle } from "../layout/sub-title";
-import { PathPicker } from "../path-picker/path-picker";
-import { Spinner } from "../spinner";
-import { RemovableItem } from "./removable-item";
-import userStoreInjectable from "../../../common/user-store/user-store.injectable";
-import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
-import loggerInjectable from "../../../common/logger.injectable";
-import type { Logger } from "../../../common/logger";
+import { Notice } from "../../../../../../renderer/components/+extensions/notice";
+import type { KubeconfigSyncEntry, KubeconfigSyncValue, UserStore } from "../../../../../../common/user-store";
+import { iter, tuple } from "../../../../../../renderer/utils";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { PathPicker } from "../../../../../../renderer/components/path-picker/path-picker";
+import { Spinner } from "../../../../../../renderer/components/spinner";
+import { RemovableItem } from "../../../removable-item/removable-item";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import isWindowsInjectable from "../../../../../../common/vars/is-windows.injectable";
+import loggerInjectable from "../../../../../../common/logger.injectable";
+import type { Logger } from "../../../../../../common/logger";
 
 interface SyncInfo {
   type: "file" | "folder" | "unknown";
@@ -66,7 +66,7 @@ interface Dependencies {
 }
 
 @observer
-class NonInjectedKubeconfigSyncs extends React.Component<Dependencies> {
+class NonInjectedKubeconfigSync extends React.Component<Dependencies> {
   syncs = observable.map<string, Value>();
   @observable loaded = false;
 
@@ -195,17 +195,19 @@ class NonInjectedKubeconfigSyncs extends React.Component<Dependencies> {
 
   render() {
     return (
-      <>
+      <section id="kube-sync">
+        <h2 data-testid="kubernetes-sync-header">Kubeconfig Syncs</h2>
+
         {this.renderSyncButtons()}
         <SubTitle title="Synced Items" className="pt-5"/>
         {this.renderEntries()}
-      </>
+      </section>
     );
   }
 }
 
-export const KubeconfigSyncs = withInjectables<Dependencies>(
-  NonInjectedKubeconfigSyncs,
+export const KubeconfigSync = withInjectables<Dependencies>(
+  NonInjectedKubeconfigSync,
 
   {
     getProps: (di) => ({
diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download-preference-block.injectable.ts
new file mode 100644
index 0000000000..7c37c0cf23
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../../preference-item-injection-token";
+import { KubectlBinaryDownload } from "./kubectl-binary-download";
+
+const kubectlBinaryDownloadPreferenceBlockInjectable = getInjectable({
+  id: "kubectl-binary-download-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "kubectl-binary-download",
+    parentId: "kubectl",
+    orderNumber: 10,
+    Component: KubectlBinaryDownload,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default kubectlBinaryDownloadPreferenceBlockInjectable;
diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download.tsx b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download.tsx
new file mode 100644
index 0000000000..de096191fd
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download.tsx
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../../common/user-store/user-store.injectable";
+import { observer } from "mobx-react";
+import { Switch } from "../../../../../../../renderer/components/switch";
+
+interface Dependencies {
+  userStore: UserStore;
+}
+
+const NonInjectedKubectlBinaryDownload = observer(({ userStore }: Dependencies) => (
+  <section>
+    <SubTitle title="Kubectl binary download" />
+    <Switch
+      checked={userStore.downloadKubectlBinaries}
+      onChange={() => userStore.downloadKubectlBinaries = !userStore.downloadKubectlBinaries}
+    >
+      Download kubectl binaries matching the Kubernetes cluster version
+    </Switch>
+  </section>
+
+));
+
+export const KubectlBinaryDownload = withInjectables<Dependencies>(
+  NonInjectedKubectlBinaryDownload,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries-preference-block.injectable.ts
new file mode 100644
index 0000000000..f820821358
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../../preference-item-injection-token";
+import { KubectlDirectoryForBinaries } from "./kubectl-directory-for-binaries";
+
+const kubectlDirectoryForBinariesPreferenceBlockInjectable = getInjectable({
+  id: "kubectl-directory-for-binaries-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "kubectl-directory-for-binaries",
+    parentId: "kubectl",
+    orderNumber: 30,
+    Component: KubectlDirectoryForBinaries,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default kubectlDirectoryForBinariesPreferenceBlockInjectable;
diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries.tsx b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries.tsx
new file mode 100644
index 0000000000..497ec68f8e
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries.tsx
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React, { useState } from "react";
+import { SubTitle } from "../../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../../common/user-store/user-store.injectable";
+import { observer } from "mobx-react";
+import { Input, InputValidators } from "../../../../../../../renderer/components/input";
+import directoryForBinariesInjectable from "../../../../../../../common/app-paths/directory-for-binaries/directory-for-binaries.injectable";
+
+interface Dependencies {
+  userStore: UserStore;
+  defaultPathForGeneralBinaries: string;
+}
+
+const NonInjectedKubectlDirectoryForBinaries = observer(
+  ({ userStore, defaultPathForGeneralBinaries }: Dependencies) => {
+    const [downloadPath, setDownloadPath] = useState(userStore.downloadBinariesPath || "");
+    const pathValidator = downloadPath ? InputValidators.isPath : undefined;
+
+    const save = () => {
+      userStore.downloadBinariesPath = downloadPath;
+    };
+
+    return (
+      <section>
+        <SubTitle title="Directory for binaries" />
+        <Input
+          theme="round-black"
+          value={downloadPath}
+          placeholder={defaultPathForGeneralBinaries}
+          validators={pathValidator}
+          onChange={setDownloadPath}
+          onBlur={save}
+          disabled={!userStore.downloadKubectlBinaries}
+        />
+        <div className="hint">The directory to download binaries into.</div>
+      </section>
+    );
+  },
+);
+
+export const KubectlDirectoryForBinaries = withInjectables<Dependencies>(
+  NonInjectedKubectlDirectoryForBinaries,
+
+  {
+    getProps: (di) => ({
+      defaultPathForGeneralBinaries: di.inject(directoryForBinariesInjectable),
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror-preference-block.injectable.ts
new file mode 100644
index 0000000000..86776ab330
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../../preference-item-injection-token";
+import { KubectlDownloadMirror } from "./kubectl-download-mirror";
+
+const kubectlDownloadMirrorPreferenceBlockInjectable = getInjectable({
+  id: "kubectl-download-mirror-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "kubectl-download-mirror",
+    parentId: "kubectl",
+    orderNumber: 20,
+    Component: KubectlDownloadMirror,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default kubectlDownloadMirrorPreferenceBlockInjectable;
diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror.tsx b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror.tsx
new file mode 100644
index 0000000000..e880ff3308
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror.tsx
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../../common/user-store/user-store.injectable";
+import { observer } from "mobx-react";
+import { Select } from "../../../../../../../renderer/components/select";
+import { defaultPackageMirror, packageMirrors } from "../../../../../../../common/user-store/preferences-helpers";
+
+interface Dependencies {
+  userStore: UserStore;
+}
+
+const downloadMirrorOptions = Array.from(packageMirrors, ([name, mirror]) => ({
+  value: name,
+  label: mirror.label,
+
+  // TODO: Side-effect
+  isDisabled: !mirror.platforms.has(process.platform),
+}));
+
+
+const NonInjectedKubectlDownloadMirror = observer(({ userStore }: Dependencies) => (
+  <section>
+    <SubTitle title="Download mirror" />
+    <Select
+      id="download-mirror-input"
+      placeholder="Download mirror for kubectl"
+      options={downloadMirrorOptions}
+      value={userStore.downloadMirror}
+      onChange={option => userStore.downloadMirror = option?.value ?? defaultPackageMirror}
+      isDisabled={!userStore.downloadKubectlBinaries}
+      themeName="lens"
+    />
+  </section>
+));
+
+export const KubectlDownloadMirror = withInjectables<Dependencies>(
+  NonInjectedKubectlDownloadMirror,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-group-preference-item.injectable.tsx b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-group-preference-item.injectable.tsx
new file mode 100644
index 0000000000..190ce03eeb
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-group-preference-item.injectable.tsx
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { PreferenceItemTypes } from "../../preference-item-injection-token";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import Gutter from "../../../../../../renderer/components/gutter/gutter";
+import React from "react";
+
+const PreferenceItemGroup = ({
+  children,
+  item,
+}: {
+  children: React.ReactElement;
+  item: PreferenceItemTypes;
+}) => <section id={item.id}>{children}</section>;
+
+const kubectlGroupPreferenceItemInjectable = getInjectable({
+  id: "kubectl-group-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "kubectl",
+    parentId: "kubernetes-page",
+    orderNumber: 10,
+    Component: PreferenceItemGroup,
+    childSeparator: () => <Gutter size="xl" />,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default kubectlGroupPreferenceItemInjectable;
diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary-preference-block.injectable.ts
new file mode 100644
index 0000000000..a87f8fd749
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../../preference-item-injection-token";
+import { KubectlPathToBinary } from "./kubectl-path-to-binary";
+
+const kubectlPathToBinaryPreferenceBlockInjectable = getInjectable({
+  id: "kubectl-path-to-binary-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "kubectl-path-to-binary",
+    parentId: "kubectl",
+    orderNumber: 40,
+    Component: KubectlPathToBinary,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default kubectlPathToBinaryPreferenceBlockInjectable;
diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary.tsx b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary.tsx
new file mode 100644
index 0000000000..ec5482cb88
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary.tsx
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React, { useState } from "react";
+import { SubTitle } from "../../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../../common/user-store/user-store.injectable";
+import { observer } from "mobx-react";
+import { Input, InputValidators } from "../../../../../../../renderer/components/input";
+import directoryForKubectlBinariesInjectable from "../../../../../../../common/app-paths/directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable";
+
+interface Dependencies {
+  userStore: UserStore;
+  defaultPathForKubectlBinaries: string;
+}
+
+const NonInjectedKubectlPathToBinary = observer(
+  ({ userStore, defaultPathForKubectlBinaries }: Dependencies) => {
+    const [binariesPath, setBinariesPath] = useState(userStore.kubectlBinariesPath || "");
+    const pathValidator = binariesPath ? InputValidators.isPath : undefined;
+
+    const save = () => {
+      userStore.kubectlBinariesPath = binariesPath;
+    };
+
+    return (
+      <section>
+        <SubTitle title="Path to kubectl binary" />
+        <Input
+          theme="round-black"
+          placeholder={defaultPathForKubectlBinaries}
+          value={binariesPath}
+          validators={pathValidator}
+          onChange={setBinariesPath}
+          onBlur={save}
+          disabled={userStore.downloadKubectlBinaries}
+        />
+      </section>
+    );
+  },
+);
+
+export const KubectlPathToBinary = withInjectables<Dependencies>(
+  NonInjectedKubectlPathToBinary,
+
+  {
+    getProps: (di) => ({
+      defaultPathForKubectlBinaries: di.inject(directoryForKubectlBinariesInjectable),
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-page.injectable.tsx b/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-page.injectable.tsx
new file mode 100644
index 0000000000..6484c67381
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-page.injectable.tsx
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { PreferenceItemComponent, PreferencePage } from "../preference-item-injection-token";
+import { preferenceItemInjectionToken } from "../preference-item-injection-token";
+import { PreferencePageComponent } from "../../preference-page-component";
+import { HorizontalLine } from "../../../../../renderer/components/horizontal-line/horizontal-line";
+import React from "react";
+
+const KubernetesPage: PreferenceItemComponent<PreferencePage> = ({ children, item }) => (
+  <PreferencePageComponent title="Kubernetes" id={item.id}>
+    {children}
+  </PreferencePageComponent>
+);
+
+const kubernetesPreferencePageInjectable = getInjectable({
+  id: "kubernetes-preference-page",
+
+  instantiate: () => ({
+    kind: "page" as const,
+    id: "kubernetes-page",
+    parentId: "kubernetes-tab",
+    Component: KubernetesPage,
+    childSeparator: () => <HorizontalLine />,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default kubernetesPreferencePageInjectable;
diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-tab.injectable.ts
new file mode 100644
index 0000000000..ae33f1177a
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-tab.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../preference-item-injection-token";
+
+const kubernetesPreferenceTabInjectable = getInjectable({
+  id: "kubernetes-preference-tab",
+
+  instantiate: () => ({
+    kind: "tab" as const,
+    id: "kubernetes-tab",
+    parentId: "general-tab-group" as const,
+    pathId: "kubernetes",
+    label: "Kubernetes",
+    orderNumber: 30,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default kubernetesPreferenceTabInjectable;
diff --git a/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts b/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts
new file mode 100644
index 0000000000..38eb14aad8
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectionToken } from "@ogre-tools/injectable";
+import type React from "react";
+import type { ChildOfParentComposite, ParentOfChildComposite } from "../../../../common/utils/composite/interfaces";
+import type { Discriminable } from "../../../../common/utils/composable-responsibilities/discriminable/discriminable";
+import type { Labelable } from "../../../../common/utils/composable-responsibilities/labelable/labelable";
+import type { MaybeShowable } from "../../../../common/utils/composable-responsibilities/showable/showable";
+import type { Orderable } from "../../../../common/utils/composable-responsibilities/orderable/orderable";
+import type { GetSeparator } from "../../../../common/utils/add-separator/add-separator";
+import type { Composite } from "../../../../common/utils/composite/get-composite/get-composite";
+
+export type ChildrenAreSeparated =
+  & { childSeparator: GetSeparator<Composite<PreferenceItemTypes>, React.ReactElement> };
+
+export type ChildrenAreMaybeSeparated =
+  & Partial<ChildrenAreSeparated>;
+
+export type PreferenceItemComponent<T> = React.ComponentType<{
+  children: React.ReactElement;
+  item: T;
+}>;
+
+export type PreferenceTab =
+  & Discriminable<"tab">
+  & ParentOfChildComposite
+  & ChildOfParentComposite
+  & MaybeShowable
+  & Labelable
+  & Orderable
+  & { pathId: string };
+
+export type PreferenceTabGroup =
+  & Discriminable<"tab-group">
+  & ParentOfChildComposite
+  & ChildOfParentComposite<"preference-tabs">
+  & MaybeShowable
+  & Labelable
+  & Orderable
+  & { iconName? : string };
+
+interface RenderableWithSiblings<T extends PreferenceItemTypes>
+  extends ChildrenAreMaybeSeparated {
+  Component: PreferenceItemComponent<T>;
+}
+
+export type PreferencePage =
+  & Discriminable<"page">
+  & ParentOfChildComposite
+  & ChildOfParentComposite
+  & MaybeShowable
+  & RenderableWithSiblings<PreferencePage>;
+
+export type PreferenceBlock =
+  & Discriminable<"block">
+  & ParentOfChildComposite
+  & ChildOfParentComposite
+  & MaybeShowable
+  & RenderableWithSiblings<PreferenceBlock>;
+
+export type PreferenceItemTypes = PreferenceTabGroup | PreferenceTab | PreferenceBlock | PreferencePage;
+
+export const preferenceItemInjectionToken = getInjectionToken<PreferenceItemTypes>({
+  id: "preference-item-injection-token",
+});
+
diff --git a/src/main/prometheus/index.ts b/src/features/preferences/renderer/preference-items/preference-tab-root.module.scss
similarity index 79%
rename from src/main/prometheus/index.ts
rename to src/features/preferences/renderer/preference-items/preference-tab-root.module.scss
index 91231ddc43..697e365b12 100644
--- a/src/main/prometheus/index.ts
+++ b/src/features/preferences/renderer/preference-items/preference-tab-root.module.scss
@@ -2,5 +2,6 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-
-export * from "./provider-registry";
+.TabSeparator {
+  padding: 0 10px;
+}
diff --git a/src/features/preferences/renderer/preference-items/preference-tab-root.tsx b/src/features/preferences/renderer/preference-items/preference-tab-root.tsx
new file mode 100644
index 0000000000..2847c07515
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/preference-tab-root.tsx
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { HorizontalLine } from "../../../../renderer/components/horizontal-line/horizontal-line";
+import type { RootComposite } from "../../../../common/utils/composite/interfaces";
+import type { Discriminable } from "../../../../common/utils/composable-responsibilities/discriminable/discriminable";
+import type { ChildrenAreSeparated } from "./preference-item-injection-token";
+import styles from "./preference-tab-root.module.scss";
+
+export type PreferenceTabsRoot =
+  & Discriminable<"preference-tabs-root">
+  & RootComposite
+  & ChildrenAreSeparated;
+
+export const preferenceTabsRoot: PreferenceTabsRoot = {
+  kind: "preference-tabs-root" as const,
+  id: "preference-tabs",
+  parentId: undefined,
+
+  childSeparator: () => (
+    <div className={styles.TabSeparator}>
+      <HorizontalLine size="sm" />
+    </div>
+  ),
+};
diff --git a/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts b/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts
new file mode 100644
index 0000000000..dd1ffd1ed8
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
+import { computed } from "mobx";
+import type { PreferenceItemTypes } from "./preference-item-injection-token";
+import { preferenceItemInjectionToken } from "./preference-item-injection-token";
+import { pipeline } from "@ogre-tools/fp";
+import type { PreferenceTabsRoot } from "./preference-tab-root";
+import { preferenceTabsRoot } from "./preference-tab-root";
+import logErrorInjectable from "../../../../common/log-error.injectable";
+import { isShown } from "../../../../common/utils/composable-responsibilities/showable/showable";
+import { orderByOrderNumber } from "../../../../common/utils/composable-responsibilities/orderable/orderable";
+import { getCompositeFor } from "../../../../common/utils/composite/get-composite/get-composite";
+
+const preferencesCompositeInjectable = getInjectable({
+  id: "preferences-composite",
+
+  instantiate: (di) => {
+    const computedInjectMany = di.inject(computedInjectManyInjectable);
+    const preferenceItems = computedInjectMany(preferenceItemInjectionToken);
+    const logError = di.inject(logErrorInjectable);
+
+    const getComposite = getCompositeFor<PreferenceItemTypes | PreferenceTabsRoot>({
+      getId: (x) => x.id,
+      getParentId: (x) => x.parentId,
+
+      handleMissingParentIds: (ids) => {
+        logError(
+          `Tried to create preferences, but encountered references to unknown ids: "${ids.missingParentIds.join(
+            '", "',
+          )}".\n\nAvailable ids are:\n\n${ids.availableParentIds.join("\n")}`,
+        );
+      },
+
+      transformChildren: (children) =>
+        pipeline(
+          children.filter(isShown),
+          orderByOrderNumber,
+        ),
+    });
+
+    return computed(() =>
+      pipeline(
+        [preferenceTabsRoot, ...preferenceItems.get()],
+        getComposite,
+      ),
+    );
+  },
+});
+
+export default preferencesCompositeInjectable;
diff --git a/src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates-preference-block.injectable.ts
new file mode 100644
index 0000000000..a423327535
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { AllowUntrustedCertificates } from "./allow-untrusted-certificates";
+
+const allowUntrustedCertificatesPreferenceBlockInjectable = getInjectable({
+  id: "allow-untrusted-certificates-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "allow-untrusted-certificates",
+    parentId: "proxy-page",
+    orderNumber: 20,
+    Component: AllowUntrustedCertificates,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default allowUntrustedCertificatesPreferenceBlockInjectable;
diff --git a/src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates.tsx b/src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates.tsx
new file mode 100644
index 0000000000..bb1abd9a57
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates.tsx
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { observer } from "mobx-react";
+import { Switch } from "../../../../../../renderer/components/switch";
+
+interface Dependencies {
+  userStore: UserStore;
+}
+
+const NonInjectedAllowUntrustedCertificates = observer(({ userStore }: Dependencies) => (
+  <section className="small">
+    <SubTitle title="Certificate Trust" />
+    <Switch
+      checked={userStore.allowUntrustedCAs}
+      onChange={() =>
+        (userStore.allowUntrustedCAs = !userStore.allowUntrustedCAs)
+      }
+    >
+      Allow untrusted Certificate Authorities
+    </Switch>
+    <small className="hint">
+      This will make Lens to trust ANY certificate authority without any
+      validations. Needed with some corporate proxies that do certificate
+      re-writing. Does not affect cluster communications!
+    </small>
+  </section>
+));
+
+export const AllowUntrustedCertificates = withInjectables<Dependencies>(
+  NonInjectedAllowUntrustedCertificates,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url-preference-block.injectable.ts
new file mode 100644
index 0000000000..1405c4bf6b
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url-preference-block.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { HttpProxyUrl } from "./http-proxy-url";
+
+const httpProxyUrlPreferenceBlockInjectable = getInjectable({
+  id: "http-proxy-url-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "http-proxy-url",
+    parentId: "proxy-page",
+    orderNumber: 10,
+    Component: HttpProxyUrl,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default httpProxyUrlPreferenceBlockInjectable;
diff --git a/src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url.tsx b/src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url.tsx
new file mode 100644
index 0000000000..7d55fd2b3b
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url.tsx
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { observer } from "mobx-react";
+import { Input } from "../../../../../../renderer/components/input";
+
+interface Dependencies {
+  userStore: UserStore;
+}
+
+const NonInjectedHttpProxyUrl = observer(
+  ({ userStore }: Dependencies) => {
+    const [proxy, setProxy] = React.useState(userStore.httpsProxy || "");
+
+    return (
+      <section>
+        <SubTitle title="HTTP Proxy" />
+        <Input
+          theme="round-black"
+          placeholder="Type HTTP proxy url (example: http://proxy.acme.org:8080)"
+          value={proxy}
+          onChange={(v) => setProxy(v)}
+          onBlur={() => (userStore.httpsProxy = proxy)}
+        />
+        <small className="hint">
+          Proxy is used only for non-cluster communication.
+        </small>
+      </section>
+    );
+  },
+);
+
+export const HttpProxyUrl = withInjectables<Dependencies>(
+  NonInjectedHttpProxyUrl,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/proxy/proxy-preference-page.injectable.tsx b/src/features/preferences/renderer/preference-items/proxy/proxy-preference-page.injectable.tsx
new file mode 100644
index 0000000000..34a698fd5c
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/proxy/proxy-preference-page.injectable.tsx
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { PreferenceItemComponent, PreferencePage } from "../preference-item-injection-token";
+import { preferenceItemInjectionToken } from "../preference-item-injection-token";
+import React from "react";
+import { PreferencePageComponent } from "../../preference-page-component";
+import { HorizontalLine } from "../../../../../renderer/components/horizontal-line/horizontal-line";
+
+const ProxyPage: PreferenceItemComponent<PreferencePage> = ({ children, item }) => (
+  <PreferencePageComponent title="Proxy" id={item.id}>
+    {children}
+  </PreferencePageComponent>
+);
+
+const proxyPreferencePageInjectable = getInjectable({
+  id: "proxy-preference-page",
+
+  instantiate: () => ({
+    kind: "page" as const,
+    id: "proxy-page",
+    parentId: "proxy-tab",
+    Component: ProxyPage,
+    childSeparator: () => <HorizontalLine size="sm" />,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default proxyPreferencePageInjectable;
diff --git a/src/features/preferences/renderer/preference-items/proxy/proxy-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/proxy/proxy-preference-tab.injectable.ts
new file mode 100644
index 0000000000..6b33c9f1d1
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/proxy/proxy-preference-tab.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../preference-item-injection-token";
+
+const proxyPreferenceTabInjectable = getInjectable({
+  id: "proxy-preference-tab",
+
+  instantiate: () => ({
+    kind: "tab" as const,
+    id: "proxy-tab",
+    parentId: "general-tab-group" as const,
+    pathId: "proxy",
+    label: "Proxy",
+    orderNumber: 20,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default proxyPreferenceTabInjectable;
diff --git a/src/features/preferences/renderer/preference-items/telemetry/automatic-error-reporting/automatic-error-reporting-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/telemetry/automatic-error-reporting/automatic-error-reporting-preference-item.injectable.ts
new file mode 100644
index 0000000000..fb627ab93c
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/telemetry/automatic-error-reporting/automatic-error-reporting-preference-item.injectable.ts
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { AutomaticErrorReporting } from "./automatic-error-reporting";
+import sentryDataSourceNameInjectable from "../../../../../../common/vars/sentry-dsn-url.injectable";
+
+const automaticErrorReportingPreferenceItemInjectable = getInjectable({
+  id: "automatic-error-reporting-preference-item",
+
+  instantiate: (di) => {
+    const sentryDnsUrl = di.inject(sentryDataSourceNameInjectable);
+
+    return {
+      kind: "block" as const,
+      id: "automatic-error-reporting",
+      parentId: "telemetry-page",
+      orderNumber: 20,
+      Component: AutomaticErrorReporting,
+      isShown: !!sentryDnsUrl,
+    };
+  },
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default automaticErrorReportingPreferenceItemInjectable;
diff --git a/src/features/preferences/renderer/preference-items/telemetry/automatic-error-reporting/automatic-error-reporting.tsx b/src/features/preferences/renderer/preference-items/telemetry/automatic-error-reporting/automatic-error-reporting.tsx
new file mode 100644
index 0000000000..7e23c0af35
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/telemetry/automatic-error-reporting/automatic-error-reporting.tsx
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { observer } from "mobx-react";
+import { Checkbox } from "../../../../../../renderer/components/checkbox";
+
+interface Dependencies {
+  userStore: UserStore;
+}
+
+const NonInjectedAutomaticErrorReporting = observer(({ userStore }: Dependencies) => (
+  <div
+    id="sentry"
+    className="small"
+    data-testid="telemetry-preferences-for-automatic-error-reporting"
+  >
+    <SubTitle title="Automatic Error Reporting" />
+    <Checkbox
+      label="Allow automatic error reporting"
+      value={userStore.allowErrorReporting}
+      onChange={(value) => (userStore.allowErrorReporting = value)}
+    />
+    <div className="hint">
+      <span>
+        Automatic error reports provide vital information about issues and
+        application crashes. It is highly recommended to keep this feature
+        enabled to ensure fast turnaround for issues you might encounter.
+      </span>
+    </div>
+  </div>
+));
+
+export const AutomaticErrorReporting = withInjectables<Dependencies>(
+  NonInjectedAutomaticErrorReporting,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-page.injectable.tsx b/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-page.injectable.tsx
new file mode 100644
index 0000000000..18ef79ab1c
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-page.injectable.tsx
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { PreferenceItemComponent, PreferencePage } from "../preference-item-injection-token";
+import { preferenceItemInjectionToken } from "../preference-item-injection-token";
+import React from "react";
+import { PreferencePageComponent } from "../../preference-page-component";
+
+const TelemetryPage: PreferenceItemComponent<PreferencePage> = ({ children, item }) => (
+  <PreferencePageComponent title="Telemetry" id={item.id}>
+    {children}
+  </PreferencePageComponent>
+);
+
+const telemetryPreferencePageInjectable = getInjectable({
+  id: "telemetry-preference-page",
+
+  instantiate: () => ({
+    kind: "page" as const,
+    id: "telemetry-page",
+    parentId: "telemetry-tab",
+    Component: TelemetryPage,
+    childSeparator: () => <hr className="small" />,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default telemetryPreferencePageInjectable;
diff --git a/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-tab.injectable.ts
new file mode 100644
index 0000000000..46021d7344
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-tab.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../preference-item-injection-token";
+
+const telemetryPreferenceTabInjectable = getInjectable({
+  id: "telemetry-preference-tab",
+
+  instantiate: () => ({
+    kind: "tab" as const,
+    id: "telemetry-tab",
+    parentId: "general-tab-group" as const,
+    pathId: "telemetry",
+    label: "Telemetry",
+    orderNumber: 60,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default telemetryPreferenceTabInjectable;
diff --git a/src/features/preferences/renderer/preference-items/terminal/copy-paste-from-terminal/copy-paste-from-terminal-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/terminal/copy-paste-from-terminal/copy-paste-from-terminal-preference-item.injectable.ts
new file mode 100644
index 0000000000..d5783cdd6d
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/terminal/copy-paste-from-terminal/copy-paste-from-terminal-preference-item.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { CopyPasteFromTerminal } from "./copy-paste-from-terminal";
+
+const copyPasteFromTerminalPreferenceItemInjectable = getInjectable({
+  id: "copy-paste-from-terminal-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "copy-paste-from-terminal-preference-item",
+    parentId: "terminal-page",
+    orderNumber: 20,
+    Component: CopyPasteFromTerminal,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default copyPasteFromTerminalPreferenceItemInjectable;
diff --git a/src/features/preferences/renderer/preference-items/terminal/copy-paste-from-terminal/copy-paste-from-terminal.tsx b/src/features/preferences/renderer/preference-items/terminal/copy-paste-from-terminal/copy-paste-from-terminal.tsx
new file mode 100644
index 0000000000..6fd65ccbbd
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/terminal/copy-paste-from-terminal/copy-paste-from-terminal.tsx
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { observer } from "mobx-react";
+import { Switch } from "../../../../../../renderer/components/switch";
+
+interface Dependencies {
+  userStore: UserStore;
+}
+
+const NonInjectedCopyPasteFromTerminal = observer(
+  ({ userStore }: Dependencies) => {
+
+    return (
+      <section id="terminalSelection">
+        <SubTitle title="Terminal copy & paste" />
+        <Switch
+          checked={userStore.terminalCopyOnSelect}
+          onChange={() => userStore.terminalCopyOnSelect = !userStore.terminalCopyOnSelect}
+        >
+          Copy on select and paste on right-click
+        </Switch>
+      </section>
+    );
+  },
+);
+
+export const CopyPasteFromTerminal = withInjectables<Dependencies>(
+  NonInjectedCopyPasteFromTerminal,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family-preference-item.injectable.ts
new file mode 100644
index 0000000000..0416afaa74
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family-preference-item.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { TerminalFontFamily } from "./terminal-font-family";
+
+const terminalFontFamilyPreferenceItemInjectable = getInjectable({
+  id: "terminal-font-family-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "terminal-font-family-preference-item",
+    parentId: "terminal-page",
+    orderNumber: 50,
+    Component: TerminalFontFamily,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default terminalFontFamilyPreferenceItemInjectable;
diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family.tsx b/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family.tsx
new file mode 100644
index 0000000000..14bc5efacd
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family.tsx
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { observer } from "mobx-react";
+import type { SelectOption } from "../../../../../../renderer/components/select";
+import { Select } from "../../../../../../renderer/components/select";
+import type { Logger } from "../../../../../../common/logger";
+import { action } from "mobx";
+import loggerInjectable from "../../../../../../common/logger.injectable";
+
+interface Dependencies {
+  userStore: UserStore;
+  logger: Logger;
+}
+
+const NonInjectedTerminalFontFamily = observer(
+  ({ userStore, logger }: Dependencies) => {
+
+    // fonts must be declared in `fonts.scss` and at `template.html` (if early-preloading required)
+    const supportedCustomFonts: SelectOption<string>[] = [
+      "RobotoMono", "Anonymous Pro", "IBM Plex Mono", "JetBrains Mono", "Red Hat Mono",
+      "Source Code Pro", "Space Mono", "Ubuntu Mono",
+    ].map(customFont => {
+      const { fontFamily, fontSize } = userStore.terminalConfig;
+
+      return {
+        label: <span style={{ fontFamily: customFont, fontSize }}>{customFont}</span>,
+        value: customFont,
+        isSelected: fontFamily === customFont,
+      };
+    });
+
+    const onFontFamilyChange = action(({ value: fontFamily }: SelectOption<string>) => {
+      logger.info(`setting terminal font to ${fontFamily}`);
+
+      userStore.terminalConfig.fontFamily = fontFamily; // save to external storage
+    });
+
+
+    return (
+      <section>
+        <SubTitle title="Font family" />
+        <Select
+          themeName="lens"
+          controlShouldRenderValue
+          value={userStore.terminalConfig.fontFamily}
+          options={supportedCustomFonts}
+          onChange={onFontFamilyChange as any}
+        />
+      </section>
+    );
+  },
+);
+
+export const TerminalFontFamily = withInjectables<Dependencies>(
+  NonInjectedTerminalFontFamily,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+      logger: di.inject(loggerInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-font-size/terminal-font-size-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/terminal/terminal-font-size/terminal-font-size-preference-item.injectable.ts
new file mode 100644
index 0000000000..f2d778575f
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-font-size/terminal-font-size-preference-item.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { TerminalFontSize } from "./terminal-font-size";
+
+const terminalFontSizePreferenceItemInjectable = getInjectable({
+  id: "terminal-font-size-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "terminal-font-size-preference-item",
+    parentId: "terminal-page",
+    orderNumber: 40,
+    Component: TerminalFontSize,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default terminalFontSizePreferenceItemInjectable;
diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-font-size/terminal-font-size.tsx b/src/features/preferences/renderer/preference-items/terminal/terminal-font-size/terminal-font-size.tsx
new file mode 100644
index 0000000000..bf11285509
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-font-size/terminal-font-size.tsx
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { observer } from "mobx-react";
+import { Input } from "../../../../../../renderer/components/input";
+
+interface Dependencies {
+  userStore: UserStore;
+}
+
+const NonInjectedTerminalFontSize = observer(
+  ({ userStore }: Dependencies) => {
+
+    return (
+      <section>
+        <SubTitle title="Font size" />
+        <Input
+          theme="round-black"
+          type="number"
+          min={10}
+          max={50}
+          defaultValue={userStore.terminalConfig.fontSize.toString()}
+          onChange={(value) => userStore.terminalConfig.fontSize = Number(value)}
+        />
+      </section>
+    );
+  },
+);
+
+export const TerminalFontSize = withInjectables<Dependencies>(
+  NonInjectedTerminalFontSize,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-page-preference-item.injectable.tsx b/src/features/preferences/renderer/preference-items/terminal/terminal-page-preference-item.injectable.tsx
new file mode 100644
index 0000000000..416765ffee
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-page-preference-item.injectable.tsx
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { PreferenceItemComponent, PreferencePage } from "../preference-item-injection-token";
+import { preferenceItemInjectionToken } from "../preference-item-injection-token";
+import { PreferencePageComponent } from "../../preference-page-component";
+import React from "react";
+
+const TerminalPage: PreferenceItemComponent<PreferencePage> = ({ children, item }) => (
+  <PreferencePageComponent title="Terminal" id={item.id}>
+    {children}
+  </PreferencePageComponent>
+);
+
+const terminalPagePreferenceItemInjectable = getInjectable({
+  id: "terminal-preference-page",
+
+  instantiate: () => ({
+    kind: "page" as const,
+    id: "terminal-page",
+    parentId: "terminal-tab",
+    Component: TerminalPage,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default terminalPagePreferenceItemInjectable;
diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/terminal/terminal-preference-tab.injectable.ts
new file mode 100644
index 0000000000..ec4a69619b
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-preference-tab.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../preference-item-injection-token";
+
+const terminalPreferenceTabInjectable = getInjectable({
+  id: "terminal-preference-tab",
+
+  instantiate: () => ({
+    kind: "tab" as const,
+    id: "terminal-tab",
+    pathId: "terminal",
+    parentId: "general-tab-group" as const,
+    label: "Terminal",
+    orderNumber: 50,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default terminalPreferenceTabInjectable;
diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release-details/call-for-helm-release-details.global-override-for-injectable.ts b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/default-shell/default-shell.global-override-for-injectable.ts
similarity index 52%
rename from src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release-details/call-for-helm-release-details.global-override-for-injectable.ts
rename to src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/default-shell/default-shell.global-override-for-injectable.ts
index 373b7cae4f..55a8d44fc2 100644
--- a/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release-details/call-for-helm-release-details.global-override-for-injectable.ts
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/default-shell/default-shell.global-override-for-injectable.ts
@@ -3,13 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getGlobalOverride } from "../../../../../../../common/test-utils/get-global-override";
-import callForHelmReleaseDetailsInjectable from "./call-for-helm-release-details.injectable";
+import defaultShellInjectable from "./default-shell.injectable";
 
 export default getGlobalOverride(
-  callForHelmReleaseDetailsInjectable,
-  () => () => {
-    throw new Error(
-      "Tried to call for helm release details without explicit override.",
-    );
-  },
+  defaultShellInjectable,
+  () => "some-default-shell",
 );
diff --git a/src/renderer/components/+preferences/default-shell.injectable.ts b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/default-shell/default-shell.injectable.ts
similarity index 86%
rename from src/renderer/components/+preferences/default-shell.injectable.ts
rename to src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/default-shell/default-shell.injectable.ts
index a8d33fe627..3ca42fb7c9 100644
--- a/src/renderer/components/+preferences/default-shell.injectable.ts
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/default-shell/default-shell.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
+import isWindowsInjectable from "../../../../../../../common/vars/is-windows.injectable";
 
 const defaultShellInjectable = getInjectable({
   id: "default-shell",
diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/terminal-shell-path-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/terminal-shell-path-preference-item.injectable.ts
new file mode 100644
index 0000000000..26c5ae8f3f
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/terminal-shell-path-preference-item.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { TerminalShellPath } from "./terminal-shell-path";
+
+const terminalShellPathPreferenceItemInjectable = getInjectable({
+  id: "terminal-shell-path-preference-item",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "terminal-shell-path",
+    parentId: "terminal-page",
+    orderNumber: 10,
+    Component: TerminalShellPath,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default terminalShellPathPreferenceItemInjectable;
diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/terminal-shell-path.tsx b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/terminal-shell-path.tsx
new file mode 100644
index 0000000000..5fe14ab9df
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/terminal-shell-path.tsx
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { observer } from "mobx-react";
+import { Input } from "../../../../../../renderer/components/input";
+import defaultShellInjectable from "./default-shell/default-shell.injectable";
+
+interface Dependencies {
+  userStore: UserStore;
+  defaultShell: string;
+}
+
+const NonInjectedTerminalShellPath = observer(
+  ({ userStore, defaultShell }: Dependencies) => {
+
+    return (
+      <section id="shell">
+        <SubTitle title="Terminal Shell Path" />
+        <Input
+          theme="round-black"
+          placeholder={defaultShell}
+          value={userStore.shell ?? ""}
+          onChange={(value) => userStore.shell = value}
+        />
+      </section>
+
+    );
+  },
+);
+
+export const TerminalShellPath = withInjectables<Dependencies>(
+  NonInjectedTerminalShellPath,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+      defaultShell: di.inject(defaultShellInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-theme/terminal-theme-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/terminal/terminal-theme/terminal-theme-preference-item.injectable.ts
new file mode 100644
index 0000000000..dd26ce8c9a
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-theme/terminal-theme-preference-item.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { preferenceItemInjectionToken } from "../../preference-item-injection-token";
+import { TerminalTheme } from "./terminal-theme";
+
+const terminalThemePreferenceItemInjectable = getInjectable({
+  id: "terminal-theme",
+
+  instantiate: () => ({
+    kind: "block" as const,
+    id: "terminal-theme",
+    parentId: "terminal-page",
+    orderNumber: 30,
+    Component: TerminalTheme,
+  }),
+
+  injectionToken: preferenceItemInjectionToken,
+});
+
+export default terminalThemePreferenceItemInjectable;
diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-theme/terminal-theme.tsx b/src/features/preferences/renderer/preference-items/terminal/terminal-theme/terminal-theme.tsx
new file mode 100644
index 0000000000..227296887c
--- /dev/null
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-theme/terminal-theme.tsx
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { UserStore } from "../../../../../../common/user-store";
+import userStoreInjectable from "../../../../../../common/user-store/user-store.injectable";
+import { observer } from "mobx-react";
+import { Select } from "../../../../../../renderer/components/select";
+import themeStoreInjectable from "../../../../../../renderer/themes/store.injectable";
+import type { ThemeStore } from "../../../../../../renderer/themes/store";
+
+interface Dependencies {
+  userStore: UserStore;
+  themeStore: ThemeStore;
+}
+
+const NonInjectedTerminalTheme = observer(
+  ({ userStore, themeStore }: Dependencies) => {
+
+    const themeOptions = [
+      {
+        value: "", // TODO: replace with a sentinal value that isn't string (and serialize it differently)
+        label: "Match Lens Theme",
+      },
+      ...Array.from(themeStore.themes, ([themeId, { name }]) => ({
+        value: themeId,
+        label: name,
+      })),
+    ];
+
+    return (
+      <section id="terminalTheme">
+        <SubTitle title="Terminal theme" />
+        <Select
+          id="terminal-theme-input"
+          themeName="lens"
+          options={themeOptions}
+          value={userStore.terminalTheme}
+          onChange={option => userStore.terminalTheme = option?.value ?? ""}
+        />
+      </section>
+    );
+  },
+);
+
+export const TerminalTheme = withInjectables<Dependencies>(
+  NonInjectedTerminalTheme,
+
+  {
+    getProps: (di) => ({
+      userStore: di.inject(userStoreInjectable),
+      themeStore: di.inject(themeStoreInjectable),
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable.ts
new file mode 100644
index 0000000000..f4e34267e8
--- /dev/null
+++ b/src/features/preferences/renderer/preference-navigation/navigate-to-preference-tab/navigate-to-preference-tab.injectable.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { navigateToRouteInjectionToken } from "../../../../../common/front-end-routing/navigate-to-route-injection-token";
+import preferencesRouteInjectable from "../../../common/preferences-route.injectable";
+
+const navigateToPreferenceTabInjectable = getInjectable({
+  id: "navigate-to-preference-tab-2",
+
+  instantiate: (di) => {
+    const navigateToRoute = di.inject(navigateToRouteInjectionToken);
+    const route = di.inject(preferencesRouteInjectable);
+
+    return (preferenceTabId: string) => {
+      navigateToRoute(route, {
+        withoutAffectingBackButton: true,
+        parameters: { preferenceTabId },
+      });
+    };
+  },
+});
+
+export default navigateToPreferenceTabInjectable;
diff --git a/src/features/preferences/renderer/preference-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable.ts b/src/features/preferences/renderer/preference-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable.ts
new file mode 100644
index 0000000000..c01ffeb633
--- /dev/null
+++ b/src/features/preferences/renderer/preference-navigation/navigate-to-preference-tab/preference-tab-is-active.injectable.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import routeIsActiveInjectable from "../../../../../renderer/routes/route-is-active.injectable";
+import preferencesRouteInjectable from "../../../common/preferences-route.injectable";
+import currentPreferenceTabIdInjectable from "../../preference-items/current-preference-tab-id.injectable";
+
+const preferenceTabIsActiveInjectable = getInjectable({
+  id: "preference-tab-is-active",
+
+  instantiate: (di, tabId: string) => {
+    const route = di.inject(preferencesRouteInjectable);
+    const routeIsActive = di.inject(routeIsActiveInjectable, route);
+    const currentTabId = di.inject(currentPreferenceTabIdInjectable);
+
+    return computed(
+      () =>
+        routeIsActive.get() && currentTabId.get() === tabId,
+    );
+  },
+
+  lifecycle: lifecycleEnum.keyedSingleton({
+    getInstanceKey: (di, tabId: string) => tabId,
+  }),
+});
+
+export default preferenceTabIsActiveInjectable;
diff --git a/src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx b/src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx
new file mode 100644
index 0000000000..1ee75298d0
--- /dev/null
+++ b/src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { Tab } from "../../../../renderer/components/tabs";
+import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab/navigate-to-preference-tab.injectable";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import { observer } from "mobx-react";
+import type { PreferenceTab } from "../preference-items/preference-item-injection-token";
+import type { IComputedValue } from "mobx";
+import preferenceTabIsActiveInjectable from "./navigate-to-preference-tab/preference-tab-is-active.injectable";
+import React from "react";
+
+interface Dependencies {
+  navigateToTab: (tabId: string) => void;
+  tabIsActive: IComputedValue<boolean>;
+}
+
+interface PreferenceNavigationTabProps {
+  tab: PreferenceTab;
+}
+
+const NonInjectedPreferencesNavigationTab = observer(({ navigateToTab, tabIsActive, tab } : Dependencies & PreferenceNavigationTabProps) => (
+  <Tab
+    onClick={() => navigateToTab(tab.pathId)}
+    active={tabIsActive.get()}
+    label={tab.label}
+    data-preference-tab-link-test={tab.pathId}
+  />
+));
+
+export const PreferencesNavigationTab = withInjectables<Dependencies, PreferenceNavigationTabProps>(
+  NonInjectedPreferencesNavigationTab,
+
+  {
+    getProps: (di, props) => ({
+      navigateToTab: di.inject(navigateToPreferenceTabInjectable),
+      tabIsActive: di.inject(preferenceTabIsActiveInjectable, props.tab.pathId),
+      ...props,
+    }),
+  },
+);
diff --git a/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx b/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx
new file mode 100644
index 0000000000..8d54e69d09
--- /dev/null
+++ b/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx
@@ -0,0 +1,102 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { Tabs } from "../../../../renderer/components/tabs";
+import React from "react";
+import type { Composite } from "../../../../common/utils/composite/get-composite/get-composite";
+import type { PreferenceItemTypes } from "../preference-items/preference-item-injection-token";
+import { Map } from "../../../../renderer/components/map/map";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { IComputedValue } from "mobx";
+import preferencesCompositeInjectable from "../preference-items/preferences-composite.injectable";
+import { observer } from "mobx-react";
+import { PreferencesNavigationTab } from "./preferences-navigation-tab";
+import { compositeHasDescendant } from "../../../../common/utils/composite/composite-has-descendant/composite-has-descendant";
+import type { PreferenceTabsRoot } from "../preference-items/preference-tab-root";
+import { Icon } from "../../../../renderer/components/icon";
+import { checkThatAllDiscriminablesAreExhausted } from "../../../../common/utils/composable-responsibilities/discriminable/discriminable";
+
+interface Dependencies {
+  composite: IComputedValue<Composite<PreferenceItemTypes | PreferenceTabsRoot>>;
+}
+
+const NonInjectedPreferencesNavigation = observer(({ composite }: Dependencies) => (
+  <Tabs className="flex column" scrollable={false}>
+    {toNavigationHierarchy(composite.get())}
+  </Tabs>
+));
+
+export const PreferencesNavigation = withInjectables<Dependencies>(
+  NonInjectedPreferencesNavigation,
+
+  {
+    getProps: (di) => ({
+      composite: di.inject(preferencesCompositeInjectable),
+    }),
+  },
+);
+
+const toNavigationHierarchy = (composite: Composite<PreferenceItemTypes | PreferenceTabsRoot>) => {
+  const value = composite.value;
+
+  switch (value.kind) {
+    // Note: These preference item types are not rendered in navigation,
+    // yet they are interesting for deciding if eg. a tab group or a tab has content
+    // somewhere in structure, and therefore not be hidden.
+    case "page":
+
+    // Intentional case fallthrough
+    case "block": {
+      return emptyRender;
+    }
+
+    case "tab-group": {
+      return (
+        <div data-preference-tab-group-test={value.id}>
+          <div className="header flex items-center">
+            {value.iconName && (
+              <Icon
+                material={value.iconName}
+                smallest
+                className="mr-3" />
+            )}
+            {value.label}
+          </div>
+
+          <Map items={composite.children.filter(hasContent)}>
+            {toNavigationHierarchy}
+          </Map>
+        </div>
+      );
+    }
+
+    case "tab": {
+      return <PreferencesNavigationTab tab={value} />;
+    }
+
+    case "preference-tabs-root": {
+      return (
+        <Map
+          // Note: stricter typing for composite children could maybe remove this curiosity.
+          items={composite.children.filter(hasContent) as Composite<PreferenceItemTypes>[]}
+          getSeparator={value.childSeparator}
+        >
+          {toNavigationHierarchy}
+        </Map>
+      );
+    }
+
+    default: {
+      throw checkThatAllDiscriminablesAreExhausted(value);
+    }
+  }
+};
+
+const hasContent = compositeHasDescendant<PreferenceItemTypes | PreferenceTabsRoot>(
+  (composite) => composite.value.kind === "block",
+);
+
+const emptyRender = <></>;
+
+
diff --git a/src/features/preferences/renderer/preference-page-component.tsx b/src/features/preferences/renderer/preference-page-component.tsx
new file mode 100644
index 0000000000..9f235d1385
--- /dev/null
+++ b/src/features/preferences/renderer/preference-page-component.tsx
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+
+interface PreferencePageComponentProps {
+  children: React.ReactElement;
+  id: string;
+  title: string;
+}
+
+export const PreferencePageComponent = ({ children, id, title }: PreferencePageComponentProps ) => (
+  <section id={id} data-preference-page-test={id}>
+    <h2 data-preference-page-title-test={true}>{title}</h2>
+
+    {children}
+  </section>
+);
diff --git a/src/features/preferences/renderer/preferences-route-component-for-legacy-extensions.injectable.ts b/src/features/preferences/renderer/preferences-route-component-for-legacy-extensions.injectable.ts
new file mode 100644
index 0000000000..981c4b3c84
--- /dev/null
+++ b/src/features/preferences/renderer/preferences-route-component-for-legacy-extensions.injectable.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { routeSpecificComponentInjectionToken } from "../../../renderer/routes/route-specific-component-injection-token";
+import preferencesRouteForLegacyExtensions from "../common/preferences-route-for-legacy-extensions.injectable";
+import { Preferences } from "./preferences";
+
+const preferencesRouteComponentInjectable = getInjectable({
+  id: "preferences-route-component-for-legacy-extensions",
+
+  instantiate: (di) => ({
+    route: di.inject(preferencesRouteForLegacyExtensions),
+    Component: Preferences,
+  }),
+
+  injectionToken: routeSpecificComponentInjectionToken,
+});
+
+export default preferencesRouteComponentInjectable;
diff --git a/src/features/preferences/renderer/preferences-route-component.injectable.ts b/src/features/preferences/renderer/preferences-route-component.injectable.ts
new file mode 100644
index 0000000000..5e90d51acc
--- /dev/null
+++ b/src/features/preferences/renderer/preferences-route-component.injectable.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { routeSpecificComponentInjectionToken } from "../../../renderer/routes/route-specific-component-injection-token";
+import { Preferences } from "./preferences";
+import preferencesRouteInjectable from "../common/preferences-route.injectable";
+
+const preferencesRouteComponentInjectable = getInjectable({
+  id: "preferences-route-component",
+
+  instantiate: (di) => ({
+    route: di.inject(preferencesRouteInjectable),
+    Component: Preferences,
+  }),
+
+  injectionToken: routeSpecificComponentInjectionToken,
+});
+
+export default preferencesRouteComponentInjectable;
diff --git a/src/renderer/components/+preferences/preferences.scss b/src/features/preferences/renderer/preferences.scss
similarity index 100%
rename from src/renderer/components/+preferences/preferences.scss
rename to src/features/preferences/renderer/preferences.scss
diff --git a/src/features/preferences/renderer/preferences.tsx b/src/features/preferences/renderer/preferences.tsx
new file mode 100644
index 0000000000..7a53b9d221
--- /dev/null
+++ b/src/features/preferences/renderer/preferences.tsx
@@ -0,0 +1,115 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import "./preferences.scss";
+import React from "react";
+
+import { SettingLayout } from "../../../renderer/components/layout/setting-layout";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import closePreferencesInjectable from "./close-preferences/close-preferences.injectable";
+import currentPreferenceTabCompositeInjectable from "./preference-items/current-preference-tab-composite.injectable";
+import type { Composite } from "../../../common/utils/composite/get-composite/get-composite";
+import type { PreferenceItemTypes, PreferenceTab } from "./preference-items/preference-item-injection-token";
+import type { IComputedValue } from "mobx";
+import { Map } from "../../../renderer/components/map/map";
+import { observer } from "mobx-react";
+import { PreferencesNavigation } from "./preference-navigation/preferences-navigation";
+import Gutter from "../../../renderer/components/gutter/gutter";
+import { checkThatAllDiscriminablesAreExhausted } from "../../../common/utils/composable-responsibilities/discriminable/discriminable";
+
+interface Dependencies {
+  closePreferences: () => void;
+  pageComposite: IComputedValue<Composite<PreferenceTab> | undefined>;
+}
+
+const NonInjectedPreferences = observer(
+  ({ closePreferences, pageComposite }: Dependencies) => {
+    const composite = pageComposite.get();
+
+    return (
+      <SettingLayout
+        navigation={<PreferencesNavigation />}
+        className="Preferences"
+        contentGaps={false}
+        closeButtonProps={{ "data-testid": "close-preferences" }}
+        back={closePreferences}
+      >
+        {composite ? (
+          toPreferenceItemHierarchy(composite)
+        ) : (
+          <div
+            className="flex items-center"
+            data-preference-page-does-not-exist-test={true}
+          >
+            No preferences found
+          </div>
+        )}
+      </SettingLayout>
+    );
+  },
+);
+
+const toPreferenceItemHierarchy = (composite: Composite<PreferenceItemTypes>) => {
+  const value = composite.value;
+
+  switch (value.kind) {
+    case "block": {
+      const Component = value.Component;
+
+      return (
+        <div data-preference-item-test={composite.id}>
+          <Component item={value}>
+            <Map
+              items={composite.children}
+              getSeparator={value.childSeparator}
+            >
+              {toPreferenceItemHierarchy}
+            </Map>
+          </Component>
+        </div>
+      );
+    }
+
+    // eslint-disable-next-line no-fallthrough
+    case "page": {
+      const Component = value.Component;
+
+      return (
+        <Component item={value}>
+          <Map
+            items={composite.children}
+            getSeparator={value.childSeparator || defaultSeparator}
+          >
+            {toPreferenceItemHierarchy}
+          </Map>
+        </Component>
+      );
+    }
+
+    case "tab-group":
+
+    // eslint-disable-next-line no-fallthrough
+    case "tab": {
+      return <Map items={composite.children}>{toPreferenceItemHierarchy}</Map>;
+    }
+
+    default: {
+      throw checkThatAllDiscriminablesAreExhausted(value);
+    }
+  }
+};
+
+export const Preferences = withInjectables<Dependencies>(
+  NonInjectedPreferences,
+
+  {
+    getProps: (di, props) => ({
+      closePreferences: di.inject(closePreferencesInjectable),
+      pageComposite: di.inject(currentPreferenceTabCompositeInjectable),
+      ...props,
+    }),
+  },
+);
+
+const defaultSeparator = () => <Gutter size="xl" />;
diff --git a/src/renderer/components/+preferences/removable-item.module.scss b/src/features/preferences/renderer/removable-item/removable-item.module.scss
similarity index 100%
rename from src/renderer/components/+preferences/removable-item.module.scss
rename to src/features/preferences/renderer/removable-item/removable-item.module.scss
diff --git a/src/renderer/components/+preferences/removable-item.tsx b/src/features/preferences/renderer/removable-item/removable-item.tsx
similarity index 88%
rename from src/renderer/components/+preferences/removable-item.tsx
rename to src/features/preferences/renderer/removable-item/removable-item.tsx
index 328ec7b5ad..ee04f9d76c 100644
--- a/src/renderer/components/+preferences/removable-item.tsx
+++ b/src/features/preferences/renderer/removable-item/removable-item.tsx
@@ -7,8 +7,8 @@ import styles from "./removable-item.module.scss";
 import type { DOMAttributes } from "react";
 import React from "react";
 
-import { cssNames } from "../../utils";
-import { Icon } from "../icon";
+import { cssNames } from "../../../../renderer/utils";
+import { Icon } from "../../../../renderer/components/icon";
 
 export interface RemovableItemProps extends DOMAttributes<any>{
   icon?: string;
diff --git a/src/features/preferences/urls-of-legacy-extensions.test.tsx b/src/features/preferences/urls-of-legacy-extensions.test.tsx
new file mode 100644
index 0000000000..1eba04c683
--- /dev/null
+++ b/src/features/preferences/urls-of-legacy-extensions.test.tsx
@@ -0,0 +1,330 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { RenderResult } from "@testing-library/react";
+import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import type { Discover } from "../../renderer/components/test-utils/discovery-of-html-elements";
+import { discoverFor } from "../../renderer/components/test-utils/discovery-of-html-elements";
+import React from "react";
+import type { Navigate } from "../../renderer/navigation/navigate.injectable";
+import navigateInjectable from "../../renderer/navigation/navigate.injectable";
+
+describe("preferences: URLs of legacy extensions", () => {
+  let builder: ApplicationBuilder;
+
+  beforeEach(() => {
+    builder = getApplicationBuilder();
+  });
+
+  describe("given extension with custom preferences and a custom preference tab", () => {
+    let rendered: RenderResult;
+    let discover: Discover;
+    let navigate: Navigate;
+
+    beforeEach(async () => {
+      rendered = await builder.render();
+
+      discover = discoverFor(() => rendered);
+
+      const testExtension = {
+        id: "some-extension-id",
+        name: "some-extension",
+
+        rendererOptions: {
+          appPreferenceTabs: [
+            {
+              title: "Some title",
+              id: "some-preference-tab-id",
+              orderNumber: 1,
+            },
+
+            {
+              title: "Some other title",
+              id: "some-other-preference-tab-id",
+              orderNumber: 2,
+            },
+          ],
+
+          appPreferences: [
+            {
+              title: "some-title",
+              id: "some-preference-item-id",
+              showInPreferencesTab: "some-preference-tab-id",
+
+              components: {
+                Hint: () => <div />,
+                Input: () => <div data-some-preference-test="some-preference" />,
+              },
+            },
+
+            {
+              title: "some-other-title",
+              id: "some-other-preference-item-id",
+              showInPreferencesTab: "some-other-preference-tab-id",
+
+              components: {
+                Hint: () => <div />,
+                Input: () => <div data-some-preference-test="some-other-preference" />,
+              },
+            },
+          ],
+        },
+      };
+
+      builder.extensions.enable(testExtension);
+
+      navigate = builder.applicationWindow.only.di.inject(navigateInjectable);
+    });
+
+    describe("when navigating to specific custom preference tab using magic string URL", () => {
+      beforeEach(() => {
+        navigate("/preferences/extension/some-extension/some-preference-tab-id");
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("shows the custom preference page for the custom preference tab", () => {
+        const { discovered } = discover.getSingleElement(
+          "preference-page",
+          "preference-item-for-extension-some-extension-additional-page-some-preference-tab-id",
+        );
+
+        expect(discovered).not.toBeNull();
+      });
+
+      it("shows the custom preferences", () => {
+        const { discovered } = discover.getSingleElement(
+          "some-preference",
+        );
+
+        expect(discovered).not.toBeNull();
+      });
+    });
+
+    describe("when navigating to unspecified custom preferences tab using magic string URL", () => {
+      beforeEach(() => {
+        navigate("/preferences/extension/some-extension");
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("cannot find contents of the arbitrary custom preference tabs", () => {
+        const { discovered } = discover.querySingleElement(
+          "some-preference",
+        );
+
+        expect(discovered).toBeNull();
+      });
+
+      it("shows the empty default preference page for the extension", () => {
+        const { discovered } = discover.getSingleElement(
+          "preference-page",
+          "preference-item-for-extension-some-extension-page",
+        );
+
+        expect(discovered).not.toBeNull();
+      });
+    });
+  });
+
+  describe("given extension with custom preferences but without a custom preference tab", () => {
+    let rendered: RenderResult;
+    let discover: Discover;
+    let navigate: Navigate;
+
+    beforeEach(async () => {
+      rendered = await builder.render();
+
+      discover = discoverFor(() => rendered);
+
+      const testExtension = {
+        id: "some-extension-id",
+        name: "some-extension",
+
+        rendererOptions: {
+          appPreferences: [
+            {
+              title: "some-title",
+              id: "some-preference-item-id",
+
+              components: {
+                Hint: () => <div />,
+                Input: () => <div data-some-preference-test />,
+              },
+            },
+          ],
+        },
+      };
+
+      builder.extensions.enable(testExtension);
+
+      navigate = builder.applicationWindow.only.di.inject(navigateInjectable);
+    });
+
+    describe("when navigating to the default preference tab using magic string URL", () => {
+      beforeEach(() => {
+        navigate("/preferences/extension/some-extension");
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("shows the preference page for the custom preferences", () => {
+        const { discovered } = discover.getSingleElement(
+          "preference-page",
+          "preference-item-for-extension-some-extension-page",
+        );
+
+        expect(discovered).not.toBeNull();
+      });
+
+      it("shows the custom preferences", () => {
+        const { discovered } = discover.getSingleElement("some-preference");
+
+        expect(discovered).not.toBeNull();
+      });
+    });
+  });
+
+  describe("given extension with both custom preference tabs and content for the default tab", () => {
+    let rendered: RenderResult;
+    let discover: Discover;
+    let navigate: Navigate;
+
+    beforeEach(async () => {
+      rendered = await builder.render();
+
+      discover = discoverFor(() => rendered);
+
+      const testExtension = {
+        id: "some-extension-id",
+        name: "some-extension",
+
+        rendererOptions: {
+          appPreferenceTabs: [
+            {
+              title: "Some title",
+              id: "some-preference-tab-id",
+              orderNumber: 1,
+            },
+
+            {
+              title: "Some other title",
+              id: "some-other-preference-tab-id",
+              orderNumber: 2,
+            },
+          ],
+
+          appPreferences: [
+            {
+              title: "some-title",
+              id: "some-preference-item-id",
+              showInPreferencesTab: "some-preference-tab-id",
+
+              components: {
+                Hint: () => <div />,
+                Input: () => <div data-some-preference-test="some-preference-in-custom-tab" />,
+              },
+            },
+
+            {
+              title: "some-other-title",
+              id: "some-other-preference-item-id",
+              showInPreferencesTab: "some-other-preference-tab-id",
+
+              components: {
+                Hint: () => <div />,
+                Input: () => <div data-some-preference-test="some-preference-in-custom-tab" />,
+              },
+            },
+
+            {
+              title: "some-title-in-default-tab",
+              id: "some-preference-item-id-in-default-tab",
+
+              components: {
+                Hint: () => <div />,
+                Input: () => <div data-some-preference-test="some-preference-in-default-tab" />,
+              },
+            },
+          ],
+        },
+      };
+
+      builder.extensions.enable(testExtension);
+
+      navigate = builder.applicationWindow.only.di.inject(navigateInjectable);
+    });
+
+    describe("when navigating to specific custom preference tab using magic string URL", () => {
+      beforeEach(() => {
+        navigate("/preferences/extension/some-extension/some-preference-tab-id");
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("shows the custom preference page for the custom preference tab", () => {
+        const { discovered } = discover.getSingleElement(
+          "preference-page",
+          "preference-item-for-extension-some-extension-additional-page-some-preference-tab-id",
+        );
+
+        expect(discovered).not.toBeNull();
+      });
+
+      it("shows the custom preferences", () => {
+        const { discovered } = discover.getSingleElement(
+          "some-preference",
+        );
+
+        expect(discovered).not.toBeNull();
+      });
+    });
+
+    describe("when navigating to unspecified custom preferences tab using magic string URL", () => {
+      beforeEach(() => {
+        navigate("/preferences/extension/some-extension");
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("cannot find contents of the arbitrary custom preference tabs", () => {
+        const { discovered } = discover.querySingleElement(
+          "some-preference",
+          "some-preference-in-custom-tab",
+        );
+
+        expect(discovered).toBeNull();
+      });
+
+      it("shows the default preference page for the extension", () => {
+        const { discovered } = discover.getSingleElement(
+          "preference-page",
+          "preference-item-for-extension-some-extension-page",
+        );
+
+        expect(discovered).not.toBeNull();
+      });
+
+      it("shows preferences of default preference page of the extension", () => {
+        const { discovered } = discover.getSingleElement(
+          "some-preference",
+          "some-preference-in-default-tab",
+        );
+
+        expect(discovered).not.toBeNull();
+      });
+    });
+  });
+});
diff --git a/src/features/quitting-and-restarting-the-app/opening-application-window-using-tray.test.ts b/src/features/quitting-and-restarting-the-app/opening-application-window-using-tray.test.ts
index 86f0a6b83a..b1769e80af 100644
--- a/src/features/quitting-and-restarting-the-app/opening-application-window-using-tray.test.ts
+++ b/src/features/quitting-and-restarting-the-app/opening-application-window-using-tray.test.ts
@@ -37,7 +37,7 @@ describe("opening application window using tray", () => {
 
         mainDi.override(
           lensResourcesDirInjectable,
-          () => "some-lens-resources-directory",
+          () => "/some-lens-resources-directory",
         );
 
         const loadFileMock = jest
@@ -119,7 +119,7 @@ describe("opening application window using tray", () => {
         });
 
         it("starts loading static HTML of splash window", () => {
-          expect(callForSplashWindowHtmlMock).toHaveBeenCalledWith("/some-absolute-root-directory/some-lens-resources-directory/static/splash.html");
+          expect(callForSplashWindowHtmlMock).toHaveBeenCalledWith("/some-lens-resources-directory/static/splash.html");
         });
 
         describe("when loading of splash window HTML resolves", () => {
diff --git a/src/features/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts b/src/features/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts
index fe903f93f3..654b361eb5 100644
--- a/src/features/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts
+++ b/src/features/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts
@@ -5,9 +5,9 @@
 
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import type { ClusterManager } from "../../main/cluster-manager";
+import type { ClusterManager } from "../../main/cluster/manager";
 import exitAppInjectable from "../../main/electron-app/features/exit-app.injectable";
-import clusterManagerInjectable from "../../main/cluster-manager.injectable";
+import clusterManagerInjectable from "../../main/cluster/manager.injectable";
 import stopServicesAndExitAppInjectable from "../../main/stop-services-and-exit-app.injectable";
 import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time";
 
@@ -45,7 +45,7 @@ describe("quitting the app using application menu", () => {
 
     describe("when application is quit", () => {
       beforeEach(() => {
-        builder.applicationMenu.click("root.quit");
+        builder.applicationMenu.click("root", "mac", "quit");
       });
 
       it("closes all windows", () => {
diff --git a/src/features/shell-sync/common/failure-channel.ts b/src/features/shell-sync/common/failure-channel.ts
new file mode 100644
index 0000000000..aed25b0da0
--- /dev/null
+++ b/src/features/shell-sync/common/failure-channel.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { MessageChannel } from "../../../common/utils/channel/message-channel-listener-injection-token";
+
+export const shellSyncFailedChannel: MessageChannel<string> = {
+  id: "shell-sync-failed-channel",
+};
diff --git a/src/features/shell-sync/main/compute-shell-environment.injectable.ts b/src/features/shell-sync/main/compute-shell-environment.injectable.ts
new file mode 100644
index 0000000000..88fcd0de84
--- /dev/null
+++ b/src/features/shell-sync/main/compute-shell-environment.injectable.ts
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { AsyncResult } from "../../../common/utils/async-result";
+import { getInjectable } from "@ogre-tools/injectable";
+import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
+import computeUnixShellEnvironmentInjectable from "./compute-unix-shell-environment.injectable";
+
+export type EnvironmentVariables = Partial<Record<string, string>>;
+export type ComputeShellEnvironment = (shell: string) => Promise<AsyncResult<EnvironmentVariables | undefined, string>>;
+
+const computeShellEnvironmentInjectable = getInjectable({
+  id: "compute-shell-environment",
+  instantiate: (di): ComputeShellEnvironment => {
+    const isWindows = di.inject(isWindowsInjectable);
+    const computeUnixShellEnvironment = di.inject(computeUnixShellEnvironmentInjectable);
+
+    if (isWindows) {
+      return async () => ({
+        callWasSuccessful: true,
+        response: undefined,
+      });
+    }
+
+    return async (shell) => {
+      const controller = new AbortController();
+      const timeoutHandle = setTimeout(() => controller.abort(), 30_000);
+      const result = await computeUnixShellEnvironment(shell, { signal: controller.signal });
+
+      clearTimeout(timeoutHandle);
+
+      if (result.callWasSuccessful) {
+        return result;
+      }
+
+      if (controller.signal.aborted) {
+        return {
+          callWasSuccessful: false,
+          error: `Resolving shell environment is taking very long. Please review your shell configuration: ${result.error}`,
+        };
+      }
+
+      return result;
+    };
+  },
+});
+
+export default computeShellEnvironmentInjectable;
+
diff --git a/src/features/shell-sync/main/compute-unix-shell-environment.global-override-for-injectable.ts b/src/features/shell-sync/main/compute-unix-shell-environment.global-override-for-injectable.ts
new file mode 100644
index 0000000000..aac810aa62
--- /dev/null
+++ b/src/features/shell-sync/main/compute-unix-shell-environment.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../../../common/test-utils/get-global-override";
+import computeUnixShellEnvironmentInjectable from "./compute-unix-shell-environment.injectable";
+
+export default getGlobalOverride(computeUnixShellEnvironmentInjectable, () => async () => {
+  throw new Error("Tried to get unix shell env without override");
+});
diff --git a/src/features/shell-sync/main/compute-unix-shell-environment.injectable.ts b/src/features/shell-sync/main/compute-unix-shell-environment.injectable.ts
new file mode 100644
index 0000000000..e0f2b2aeb1
--- /dev/null
+++ b/src/features/shell-sync/main/compute-unix-shell-environment.injectable.ts
@@ -0,0 +1,185 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { EnvironmentVariables } from "./compute-shell-environment.injectable";
+import { getInjectable } from "@ogre-tools/injectable";
+import getBasenameOfPathInjectable from "../../../common/path/get-basename.injectable";
+import spawnInjectable from "../../../main/child-process/spawn.injectable";
+import randomUUIDInjectable from "../../../main/crypto/random-uuid.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
+import processExecPathInjectable from "./execPath.injectable";
+import processEnvInjectable from "./env.injectable";
+import { object } from "../../../common/utils";
+import type { AsyncResult } from "../../../common/utils/async-result";
+
+export interface UnixShellEnvOptions {
+  signal: AbortSignal;
+}
+
+export type ComputeUnixShellEnvironment = (shell: string, opts: UnixShellEnvOptions) => Promise<AsyncResult<EnvironmentVariables, string>>;
+
+/**
+ * @param src The object containing the current environment variables
+ * @param overrides The environment variables that want to be overridden before passing the env to a child process
+ * @returns The combination of environment variables and a function which resets an object of environment variables to the values the keys corresponded to in `src` (rather than `overrides`)
+ */
+const getResetProcessEnv = (src: Partial<Record<string, string>>, overrides: Partial<Record<string, string>>): {
+  resetEnvPairs: (target: Partial<Record<string, string>>) => void;
+  env: Partial<Record<string, string>>;
+} => {
+  const originals = object.entries(overrides).map(([name]) => [name, src[name]] as const);
+
+  return {
+    env: {
+      ...src,
+      ...overrides,
+    },
+    resetEnvPairs: (target) => {
+      for (const [name, orginalValue] of originals) {
+        if (typeof orginalValue === "string") {
+          target[name] = orginalValue;
+        } else {
+          delete target[name];
+        }
+      }
+    },
+  };
+};
+
+const computeUnixShellEnvironmentInjectable = getInjectable({
+  id: "compute-unix-shell-environment",
+  instantiate: (di): ComputeUnixShellEnvironment => {
+    const powerShellName = /^pwsh(-preview)?$/;
+    const cshLikeShellName = /^(t?csh)$/;
+    const fishLikeShellName = /^fish$/;
+
+    const getBasenameOfPath = di.inject(getBasenameOfPathInjectable);
+    const spawn = di.inject(spawnInjectable);
+    const logger = di.inject(loggerInjectable);
+    const randomUUID = di.inject(randomUUIDInjectable);
+    const processExecPath = di.inject(processExecPathInjectable);
+    const processEnv = di.inject(processEnvInjectable);
+
+    const getShellSpecifices = (shellName: string) => {
+      const mark = randomUUID().replace(/-/g, "");
+      const regex = new RegExp(`${mark}(\\{.*\\})${mark}`);
+
+      if (powerShellName.test(shellName)) {
+        // Older versions of PowerShell removes double quotes sometimes so we use "double single quotes" which is how
+        // you escape single quotes inside of a single quoted string.
+        return {
+          command: `Command '${processExecPath}' -p '\\"${mark}\\" + JSON.stringify(process.env) + \\"${mark}\\"'`,
+          shellArgs: ["-Login"],
+          regex,
+        };
+      }
+
+      let command = `'${processExecPath}' -p '"${mark}" + JSON.stringify(process.env) + "${mark}"'`;
+      const shellArgs = ["-l"];
+
+      if (fishLikeShellName.test(shellName)) {
+        shellArgs.push("-c", command);
+        command = "";
+      } else if (!cshLikeShellName.test(shellName)) {
+        // zsh (at least, maybe others) don't load RC files when in non-interactive mode, even when using -l (login) option
+        shellArgs.push("-i");
+      } else {
+        // Some shells don't support any other options when providing the -l (login) shell option
+      }
+
+      return { command, shellArgs, regex };
+    };
+
+
+    return async (shellPath, opts) => {
+      const { resetEnvPairs, env } = getResetProcessEnv(processEnv, {
+        ELECTRON_RUN_AS_NODE: "1",
+        ELECTRON_NO_ATTACH_CONSOLE: "1",
+        TERM: "screen-256color-bce", // required for fish
+      });
+      const shellName = getBasenameOfPath(shellPath);
+      const { command, shellArgs, regex } = getShellSpecifices(shellName);
+
+      logger.info(`[UNIX-SHELL-ENV]: running against ${shellPath}`, { command, shellArgs });
+
+      return new Promise((resolve) => {
+        const shellProcess = spawn(shellPath, shellArgs, {
+          signal: opts.signal,
+          detached: true,
+          env,
+        });
+        const stdout: Buffer[] = [];
+        const stderr: Buffer[] = [];
+
+        const getErrorContext = (other: object = {}) => {
+          const context = {
+            ...other,
+            stdout: Buffer.concat(stdout).toString("utf-8"),
+            stderr: Buffer.concat(stderr).toString("utf-8"),
+          };
+
+          return JSON.stringify(context, null, 4);
+        };
+
+        shellProcess.stdout.on("data", b => stdout.push(b));
+        shellProcess.stderr.on("data", b => stderr.push(b));
+
+        shellProcess.on("error", (error) => {
+          if (opts.signal.aborted) {
+            resolve({
+              callWasSuccessful: false,
+              error: `timeout: ${getErrorContext()}`,
+            });
+          } else {
+            resolve({
+              callWasSuccessful: false,
+              error: `Failed to spawn ${shellPath}: ${getErrorContext({ error: String(error) })}`,
+            });
+          }
+        });
+        shellProcess.on("close", (code, signal) => {
+          if (code || signal) {
+            return resolve({
+              callWasSuccessful: false,
+              error: `Shell did not exit sucessfully: ${getErrorContext({ code, signal })}`,
+            });
+          }
+
+          try {
+            const rawOutput = Buffer.concat(stdout).toString("utf-8");
+
+            logger.debug(`[UNIX-SHELL-ENV]: got the following output`, { rawOutput });
+
+            const matchedOutput = regex.exec(rawOutput)?.[1];
+
+            if (!matchedOutput) {
+              return resolve({
+                callWasSuccessful: false,
+                error: "Something has blocked the shell from producing the environement variables",
+              });
+            }
+
+            const resolvedEnv = JSON.parse(matchedOutput) as Partial<Record<string, string>>;
+
+            resetEnvPairs(resolvedEnv);
+            resolve({
+              callWasSuccessful: true,
+              response: resolvedEnv,
+            });
+          } catch (err) {
+            resolve({
+              callWasSuccessful: false,
+              error: String(err),
+            });
+          }
+        });
+
+        shellProcess.stdin.end(command);
+      });
+    };
+  },
+  causesSideEffects: true,
+});
+
+export default computeUnixShellEnvironmentInjectable;
diff --git a/src/features/shell-sync/main/compute-unix-shell-environment.test.ts b/src/features/shell-sync/main/compute-unix-shell-environment.test.ts
new file mode 100644
index 0000000000..55766fbb8a
--- /dev/null
+++ b/src/features/shell-sync/main/compute-unix-shell-environment.test.ts
@@ -0,0 +1,509 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { DiContainer } from "@ogre-tools/injectable";
+import type { ChildProcessWithoutNullStreams } from "child_process";
+import EventEmitter from "events";
+import { flushPromises } from "../../../common/test-utils/flush-promises";
+import type { Spawn } from "../../../main/child-process/spawn.injectable";
+import spawnInjectable from "../../../main/child-process/spawn.injectable";
+import randomUUIDInjectable from "../../../main/crypto/random-uuid.injectable";
+import { getDiForUnitTesting } from "../../../main/getDiForUnitTesting";
+import type { ComputeUnixShellEnvironment } from "./compute-unix-shell-environment.injectable";
+import computeUnixShellEnvironmentInjectable from "./compute-unix-shell-environment.injectable";
+import processEnvInjectable from "./env.injectable";
+import processExecPathInjectable from "./execPath.injectable";
+import MemoryStream from "memorystream";
+
+const expectedEnv = {
+  SOME_ENV_VAR: "some-env-value",
+  ELECTRON_RUN_AS_NODE: "1",
+  ELECTRON_NO_ATTACH_CONSOLE: "1",
+  TERM: "screen-256color-bce",
+  SOME_THIRD_NON_UNDEFINED_VALUE: "",
+};
+
+describe("computeUnixShellEnvironment technical tests", () => {
+  let di: DiContainer;
+  let computeUnixShellEnvironment: ComputeUnixShellEnvironment;
+  let spawnMock: jest.MockedFunction<Spawn>;
+  let shellProcessFake: ChildProcessWithoutNullStreams;
+  let stdinValue: string;
+  let shellStdin: MemoryStream;
+  let shellStdout: MemoryStream;
+  let shellStderr: MemoryStream;
+  let unixShellEnv: ReturnType<ComputeUnixShellEnvironment>;
+
+  beforeEach(() => {
+    di = getDiForUnitTesting({
+      doGeneralOverrides: true,
+    });
+
+    spawnMock = jest.fn().mockImplementation((spawnfile, spawnargs) => {
+      shellStdin = new MemoryStream();
+      shellStdout = new MemoryStream();
+      shellStderr = new MemoryStream();
+      stdinValue = "";
+
+      shellStdin.on("data", (chunk) => {
+        stdinValue += chunk.toString();
+      });
+
+      return shellProcessFake = Object.assign(new EventEmitter(), {
+        stdin: shellStdin,
+        stdout: shellStdout,
+        stderr: shellStderr,
+        stdio: [
+          shellStdin,
+          shellStdout,
+          shellStderr,
+        ] as any,
+        killed: false,
+        kill: jest.fn(),
+        send: jest.fn(),
+        disconnect: jest.fn(),
+        unref: jest.fn(),
+        ref: jest.fn(),
+        connected: false,
+        exitCode: null,
+        signalCode: null,
+        spawnargs,
+        spawnfile,
+      });
+    });
+    di.override(spawnInjectable, () => spawnMock);
+    di.override(randomUUIDInjectable, () => () => "deadbeef");
+
+    di.override(processEnvInjectable, () => ({
+      SOME_ENV_VAR: "some-env-value",
+      TERM: "some-other-value",
+      SOME_THIRD_NON_UNDEFINED_VALUE: "",
+    }));
+    di.override(processExecPathInjectable, () => "/some/process/exec/path");
+
+    di.unoverride(computeUnixShellEnvironmentInjectable);
+    di.permitSideEffects(computeUnixShellEnvironmentInjectable);
+    computeUnixShellEnvironment = di.inject(computeUnixShellEnvironmentInjectable);
+  });
+
+  describe.each([
+    "/bin/csh",
+    "/bin/tcsh",
+  ])("when shell is %s", (shellPath) => {
+    beforeEach(async () => {
+      const controller = new AbortController();
+
+      unixShellEnv = computeUnixShellEnvironment(shellPath, { signal: controller.signal });
+      await flushPromises();
+    });
+
+    it("should spawn a process with the correct arguments", () => {
+      expect(spawnMock).toBeCalledWith(
+        shellPath,
+        [
+          "-l",
+        ],
+        expect.objectContaining({
+          env: expectedEnv,
+        }),
+      );
+    });
+
+    it("should send the command via stdin", () => {
+      expect(stdinValue).toBe(`'/some/process/exec/path' -p '"deadbeef" + JSON.stringify(process.env) + "deadbeef"'`);
+    });
+
+    it("should close stdin", () => {
+      expect(shellStdin.readableEnded).toBe(true);
+    });
+
+    describe("when process errors", () => {
+      beforeEach(() => {
+        shellProcessFake.emit("error", new Error("some-error"));
+      });
+
+      it("should resolve with a failed call", async () => {
+        await expect(unixShellEnv).resolves.toEqual({
+          callWasSuccessful: false,
+          error: `Failed to spawn ${shellPath}: ${JSON.stringify({
+            error: "Error: some-error",
+            stdout: "",
+            stderr: "",
+          }, null, 4)}`,
+        });
+      });
+    });
+
+    describe("when process exits with non-zero exit code", () => {
+      beforeEach(() => {
+        shellProcessFake.emit("close", 1, null);
+      });
+
+      it("should resolve with a failed call", async () => {
+        await expect(unixShellEnv).resolves.toEqual({
+          callWasSuccessful: false,
+          error: 'Shell did not exit sucessfully: {\n    "code": 1,\n    "signal": null,\n    "stdout": "",\n    "stderr": ""\n}',
+        });
+      });
+    });
+
+    describe("when process exits with a signal", () => {
+      beforeEach(() => {
+        shellProcessFake.emit("close", 0, "SIGKILL");
+      });
+
+      it("should resolve with a failed call", async () => {
+        await expect(unixShellEnv).resolves.toEqual({
+          callWasSuccessful: false,
+          error: 'Shell did not exit sucessfully: {\n    "code": 0,\n    "signal": "SIGKILL",\n    "stdout": "",\n    "stderr": ""\n}',
+        });
+      });
+    });
+
+    describe("when process stdout emits some data", () => {
+      beforeEach(() => {
+        const fakeInnerEnv = {
+          PATH: "/bin",
+          ...expectedEnv,
+        };
+
+        shellStdout.emit("data", Buffer.from(`some-other-datadeadbeef${JSON.stringify(fakeInnerEnv)}deadbeefsome-third-other-data`));
+      });
+
+      describe("when process successfully exits", () => {
+        beforeEach(() => {
+          shellProcessFake.emit("close", 0);
+        });
+
+        it("should resolve the env", async () => {
+          await expect(unixShellEnv).resolves.toEqual({
+            callWasSuccessful: true,
+            response: {
+              PATH: "/bin",
+              SOME_ENV_VAR: "some-env-value",
+              TERM: "some-other-value",
+              SOME_THIRD_NON_UNDEFINED_VALUE: "",
+            },
+          });
+        });
+      });
+    });
+  });
+
+  describe.each([
+    "/bin/bash",
+    "/bin/sh",
+    "/bin/zsh",
+  ])("when shell is %s", (shellPath) => {
+    beforeEach(async () => {
+      const controller = new AbortController();
+
+      unixShellEnv = computeUnixShellEnvironment(shellPath, { signal: controller.signal });
+      await flushPromises();
+    });
+
+    it("should spawn a process with the correct arguments", () => {
+      expect(spawnMock).toBeCalledWith(
+        shellPath,
+        [
+          "-l",
+          "-i",
+        ],
+        expect.objectContaining({
+          env: expectedEnv,
+        }),
+      );
+    });
+
+    it("should send the command via stdin", () => {
+      expect(stdinValue).toBe(`'/some/process/exec/path' -p '"deadbeef" + JSON.stringify(process.env) + "deadbeef"'`);
+    });
+
+    it("should close stdin", () => {
+      expect(shellStdin.readableEnded).toBe(true);
+    });
+
+    describe("when process errors", () => {
+      beforeEach(() => {
+        shellProcessFake.emit("error", new Error("some-error"));
+      });
+
+      it("should resolve with a failed call", async () => {
+        await expect(unixShellEnv).resolves.toEqual({
+          callWasSuccessful: false,
+          error: `Failed to spawn ${shellPath}: ${JSON.stringify({
+            error: "Error: some-error",
+            stdout: "",
+            stderr: "",
+          }, null, 4)}`,
+        });
+      });
+    });
+
+    describe("when process exits with non-zero exit code", () => {
+      beforeEach(() => {
+        shellProcessFake.emit("close", 1, null);
+      });
+
+      it("should resolve with a failed call", async () => {
+        await expect(unixShellEnv).resolves.toEqual({
+          callWasSuccessful: false,
+          error: 'Shell did not exit sucessfully: {\n    "code": 1,\n    "signal": null,\n    "stdout": "",\n    "stderr": ""\n}',
+        });
+      });
+    });
+
+    describe("when process exits with a signal", () => {
+      beforeEach(() => {
+        shellProcessFake.emit("close", 0, "SIGKILL");
+      });
+
+      it("should resolve with a failed call", async () => {
+        await expect(unixShellEnv).resolves.toEqual({
+          callWasSuccessful: false,
+          error: 'Shell did not exit sucessfully: {\n    "code": 0,\n    "signal": "SIGKILL",\n    "stdout": "",\n    "stderr": ""\n}',
+        });
+      });
+    });
+
+    describe("when process stdout emits some data", () => {
+      beforeEach(() => {
+        const fakeInnerEnv = {
+          PATH: "/bin",
+          ...expectedEnv,
+        };
+
+        shellStdout.emit("data", Buffer.from(`some-other-datadeadbeef${JSON.stringify(fakeInnerEnv)}deadbeefsome-third-other-data`));
+      });
+
+      describe("when process successfully exits", () => {
+        beforeEach(() => {
+          shellProcessFake.emit("close", 0);
+        });
+
+        it("should resolve the env", async () => {
+          await expect(unixShellEnv).resolves.toEqual({
+            callWasSuccessful: true,
+            response: {
+              PATH: "/bin",
+              SOME_ENV_VAR: "some-env-value",
+              TERM: "some-other-value",
+              SOME_THIRD_NON_UNDEFINED_VALUE: "",
+            },
+          });
+        });
+      });
+    });
+  });
+
+  describe.each([
+    "/usr/local/bin/fish",
+  ])("when shell is %s", (shellPath) => {
+    beforeEach(async () => {
+      const controller = new AbortController();
+
+      unixShellEnv = computeUnixShellEnvironment(shellPath, { signal: controller.signal });
+      await flushPromises();
+    });
+
+    it("should spawn a process with the correct arguments", () => {
+      expect(spawnMock).toBeCalledWith(
+        shellPath,
+        [
+          "-l",
+          "-c",
+          `'/some/process/exec/path' -p '"deadbeef" + JSON.stringify(process.env) + "deadbeef"'`,
+        ],
+        expect.objectContaining({
+          env: expectedEnv,
+        }),
+      );
+    });
+
+    it("should not send anything via stdin", () => {
+      expect(stdinValue).toBe("");
+    });
+
+    it("should close stdin", () => {
+      expect(shellStdin.readableEnded).toBe(true);
+    });
+
+    describe("when process errors", () => {
+      beforeEach(() => {
+        shellProcessFake.emit("error", new Error("some-error"));
+      });
+
+      it("should resolve with a failed call", async () => {
+        await expect(unixShellEnv).resolves.toEqual({
+          callWasSuccessful: false,
+          error: `Failed to spawn ${shellPath}: ${JSON.stringify({
+            error: "Error: some-error",
+            stdout: "",
+            stderr: "",
+          }, null, 4)}`,
+        });
+      });
+    });
+
+    describe("when process exits with non-zero exit code", () => {
+      beforeEach(() => {
+        shellProcessFake.emit("close", 1, null);
+      });
+
+      it("should resolve with a failed call", async () => {
+        await expect(unixShellEnv).resolves.toEqual({
+          callWasSuccessful: false,
+          error: 'Shell did not exit sucessfully: {\n    "code": 1,\n    "signal": null,\n    "stdout": "",\n    "stderr": ""\n}',
+        });
+      });
+    });
+
+    describe("when process exits with a signal", () => {
+      beforeEach(() => {
+        shellProcessFake.emit("close", 0, "SIGKILL");
+      });
+
+      it("should resolve with a failed call", async () => {
+        await expect(unixShellEnv).resolves.toEqual({
+          callWasSuccessful: false,
+          error: 'Shell did not exit sucessfully: {\n    "code": 0,\n    "signal": "SIGKILL",\n    "stdout": "",\n    "stderr": ""\n}',
+        });
+      });
+    });
+
+    describe("when process stdout emits some data", () => {
+      beforeEach(() => {
+        const fakeInnerEnv = {
+          PATH: "/bin",
+          ...expectedEnv,
+        };
+
+        shellStdout.emit("data", Buffer.from(`some-other-datadeadbeef${JSON.stringify(fakeInnerEnv)}deadbeefsome-third-other-data`));
+      });
+
+      describe("when process successfully exits", () => {
+        beforeEach(() => {
+          shellProcessFake.emit("close", 0);
+        });
+
+        it("should resolve the env", async () => {
+          await expect(unixShellEnv).resolves.toEqual({
+            callWasSuccessful: true,
+            response: {
+              PATH: "/bin",
+              SOME_ENV_VAR: "some-env-value",
+              TERM: "some-other-value",
+              SOME_THIRD_NON_UNDEFINED_VALUE: "",
+            },
+          });
+        });
+      });
+    });
+  });
+
+  describe.each([
+    "/usr/local/bin/pwsh",
+    "/usr/local/bin/pwsh-preview",
+  ])("when shell is %s", (shellPath) => {
+    beforeEach(async () => {
+      const controller = new AbortController();
+
+      unixShellEnv = computeUnixShellEnvironment(shellPath, { signal: controller.signal });
+      await flushPromises();
+    });
+
+    it("should spawn a process with the correct arguments", () => {
+      expect(spawnMock).toBeCalledWith(
+        shellPath,
+        [
+          "-Login",
+        ],
+        expect.objectContaining({
+          env: expectedEnv,
+        }),
+      );
+    });
+
+    it("should send the command via stdin", () => {
+      expect(stdinValue).toBe(`Command '/some/process/exec/path' -p '\\"deadbeef\\" + JSON.stringify(process.env) + \\"deadbeef\\"'`);
+    });
+
+    it("should close stdin", () => {
+      expect(shellStdin.readableEnded).toBe(true);
+    });
+
+    describe("when process errors", () => {
+      beforeEach(() => {
+        shellProcessFake.emit("error", new Error("some-error"));
+      });
+
+      it("should resolve with a failed call", async () => {
+        await expect(unixShellEnv).resolves.toEqual({
+          callWasSuccessful: false,
+          error: `Failed to spawn ${shellPath}: ${JSON.stringify({
+            error: "Error: some-error",
+            stdout: "",
+            stderr: "",
+          }, null, 4)}`,
+        });
+      });
+    });
+
+    describe("when process exits with non-zero exit code", () => {
+      beforeEach(() => {
+        shellProcessFake.emit("close", 1, null);
+      });
+
+      it("should resolve with a failed call", async () => {
+        await expect(unixShellEnv).resolves.toEqual({
+          callWasSuccessful: false,
+          error: 'Shell did not exit sucessfully: {\n    "code": 1,\n    "signal": null,\n    "stdout": "",\n    "stderr": ""\n}',
+        });
+      });
+    });
+
+    describe("when process exits with a signal", () => {
+      beforeEach(() => {
+        shellProcessFake.emit("close", 0, "SIGKILL");
+      });
+
+      it("should resolve with a failed call", async () => {
+        await expect(unixShellEnv).resolves.toEqual({
+          callWasSuccessful: false,
+          error: 'Shell did not exit sucessfully: {\n    "code": 0,\n    "signal": "SIGKILL",\n    "stdout": "",\n    "stderr": ""\n}',
+        });
+      });
+    });
+
+    describe("when process stdout emits some data", () => {
+      beforeEach(() => {
+        const fakeInnerEnv = {
+          PATH: "/bin",
+          ...expectedEnv,
+        };
+
+        shellStdout.emit("data", Buffer.from(`some-other-datadeadbeef${JSON.stringify(fakeInnerEnv)}deadbeefsome-third-other-data`));
+      });
+
+      describe("when process successfully exits", () => {
+        beforeEach(() => {
+          shellProcessFake.emit("close", 0);
+        });
+
+        it("should resolve the env", async () => {
+          await expect(unixShellEnv).resolves.toEqual({
+            callWasSuccessful: true,
+            response: {
+              PATH: "/bin",
+              SOME_ENV_VAR: "some-env-value",
+              TERM: "some-other-value",
+              SOME_THIRD_NON_UNDEFINED_VALUE: "",
+            },
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/src/features/shell-sync/main/emit-failure.injectable.ts b/src/features/shell-sync/main/emit-failure.injectable.ts
new file mode 100644
index 0000000000..5abdfafa52
--- /dev/null
+++ b/src/features/shell-sync/main/emit-failure.injectable.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { MessageChannelSender } from "../../../common/utils/channel/message-to-channel-injection-token";
+import { sendMessageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
+import { shellSyncFailedChannel } from "../common/failure-channel";
+
+const emitShellSyncFailedInjectable = getInjectable({
+  id: "emit-shell-sync-failed",
+  instantiate: (di): MessageChannelSender<typeof shellSyncFailedChannel> => {
+    const sendMessageToChannel = di.inject(sendMessageToChannelInjectionToken);
+
+    return (error) => sendMessageToChannel(shellSyncFailedChannel, error);
+  },
+});
+
+export default emitShellSyncFailedInjectable;
diff --git a/src/features/shell-sync/main/env.injectable.ts b/src/features/shell-sync/main/env.injectable.ts
new file mode 100644
index 0000000000..e9c359354f
--- /dev/null
+++ b/src/features/shell-sync/main/env.injectable.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import process from "process";
+
+const processEnvInjectable = getInjectable({
+  id: "process-env",
+  instantiate: () => process.env,
+  causesSideEffects: true,
+});
+
+export default processEnvInjectable;
diff --git a/src/features/shell-sync/main/execPath.injectable.ts b/src/features/shell-sync/main/execPath.injectable.ts
new file mode 100644
index 0000000000..75ad886a29
--- /dev/null
+++ b/src/features/shell-sync/main/execPath.injectable.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import process from "process";
+
+const processExecPathInjectable = getInjectable({
+  id: "process-exec-path",
+  instantiate: () => process.execPath,
+  causesSideEffects: true,
+});
+
+export default processExecPathInjectable;
diff --git a/src/features/shell-sync/main/setup-shell.injectable.ts b/src/features/shell-sync/main/setup-shell.injectable.ts
new file mode 100644
index 0000000000..a534411a1f
--- /dev/null
+++ b/src/features/shell-sync/main/setup-shell.injectable.ts
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import loggerInjectable from "../../../common/logger.injectable";
+import { onLoadOfApplicationInjectionToken } from "../../../main/start-main-application/runnable-tokens/on-load-of-application-injection-token";
+import { unionPATHs } from "../../../common/utils/union-env-path";
+import isSnapPackageInjectable from "../../../common/vars/is-snap-package.injectable";
+import electronAppInjectable from "../../../main/electron-app/electron-app.injectable";
+import computeShellEnvironmentInjectable from "./compute-shell-environment.injectable";
+import userShellSettingInjectable from "../../../common/user-store/shell-setting.injectable";
+import emitShellSyncFailedInjectable from "./emit-failure.injectable";
+
+const setupShellInjectable = getInjectable({
+  id: "setup-shell",
+
+  instantiate: (di) => {
+    const logger = di.inject(loggerInjectable);
+    const isSnapPackage = di.inject(isSnapPackageInjectable);
+    const electronApp = di.inject(electronAppInjectable);
+    const resolvedUserShellSetting = di.inject(userShellSettingInjectable);
+    const computeShellEnvironment = di.inject(computeShellEnvironmentInjectable);
+    const emitShellSyncFailed = di.inject(emitShellSyncFailedInjectable);
+
+    return {
+      id: "setup-shell",
+      run: async (): Promise<void> => {
+        logger.info("🐚 Syncing shell environment");
+
+        const result = await computeShellEnvironment(resolvedUserShellSetting.get());
+
+        if (!result.callWasSuccessful) {
+          logger.error(`[SHELL-SYNC]: ${result.error}`);
+          emitShellSyncFailed(result.error);
+
+          return;
+        }
+
+        const env = result.response;
+
+        if (!env) {
+          return void logger.debug("[SHELL-SYNC]: nothing to do, env not special in shells");
+        }
+
+        if (!env.LANG) {
+          // the LANG env var expects an underscore instead of electron's dash
+          env.LANG = `${electronApp.getLocale().replace("-", "_")}.UTF-8`;
+        } else if (!env.LANG.endsWith(".UTF-8")) {
+          env.LANG += ".UTF-8";
+        }
+
+        if (!isSnapPackage) {
+          // Prefer the synced PATH over the initial one
+          process.env.PATH = unionPATHs(env.PATH ?? "",  process.env.PATH ?? "");
+        }
+
+        // The spread operator allows joining of objects. The precedence is last to first.
+        process.env = {
+          ...env,
+          ...process.env,
+        };
+
+        logger.info(`[SHELL-SYNC]: Synced shell env`);
+        logger.debug(`[SHELL-SYNC]: updated env`, process.env);
+      },
+    };
+  },
+
+  injectionToken: onLoadOfApplicationInjectionToken,
+  causesSideEffects: true,
+});
+
+export default setupShellInjectable;
diff --git a/src/features/shell-sync/renderer/failure-listener.injectable.ts b/src/features/shell-sync/renderer/failure-listener.injectable.ts
new file mode 100644
index 0000000000..2014397fad
--- /dev/null
+++ b/src/features/shell-sync/renderer/failure-listener.injectable.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getMessageChannelListenerInjectable } from "../../../common/utils/channel/message-channel-listener-injection-token";
+import showErrorNotificationInjectable from "../../../renderer/components/notifications/show-error-notification.injectable";
+import { shellSyncFailedChannel } from "../common/failure-channel";
+
+const shellSyncFailureListenerInjectable = getMessageChannelListenerInjectable({
+  id: "notification",
+  channel: shellSyncFailedChannel,
+  handler: (di) => {
+    const showErrorNotification = di.inject(showErrorNotificationInjectable);
+
+    return (errorMessage) => showErrorNotification(`Failed to sync shell environment: ${errorMessage}`);
+  },
+});
+
+export default shellSyncFailureListenerInjectable;
diff --git a/src/features/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap b/src/features/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap
index d7f4658367..ea7ac99ae2 100644
--- a/src/features/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap
+++ b/src/features/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap
@@ -12,44 +12,61 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -78,7 +95,7 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
                 style="width: 320px;"
               >
                 <h2>
-                  Welcome to OpenLens!
+                  Welcome to some-product-name!
                 </h2>
                 <p>
                   To get you started we have auto-detected your clusters in your
@@ -184,6 +201,7 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -191,6 +209,7 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
         >
           <div
             class="item"
+            data-origin="some-name"
           >
             <div
               data-testid="some-testId"
@@ -200,6 +219,7 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
           </div>
           <div
             class="item"
+            data-origin="some-name"
           >
             <div
               data-testid="some-testId"
@@ -214,6 +234,7 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
         >
           <div
             class="item"
+            data-origin="some-name"
           >
             <div
               data-testid="some-testId"
@@ -223,6 +244,7 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
           </div>
           <div
             class="item"
+            data-origin="some-name"
           >
             <span
               data-testid="some-testId"
@@ -232,6 +254,7 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
           </div>
           <div
             class="item"
+            data-origin="some-name"
           >
             <span
               data-testid="some-testId"
diff --git a/src/features/telemetry/renderer/telemetry-white-list-for-functions.injectable.ts b/src/features/telemetry/renderer/telemetry-white-list-for-functions.injectable.ts
index 00c6dcf03b..38f0bb6ca6 100644
--- a/src/features/telemetry/renderer/telemetry-white-list-for-functions.injectable.ts
+++ b/src/features/telemetry/renderer/telemetry-white-list-for-functions.injectable.ts
@@ -100,15 +100,6 @@ const terminal = [
   "create-terminal-tab",
 ];
 
-const logs = [
-  "get-logs",
-];
-
-const resourceEditor = [
-  "create-edit-resource-tab",
-  "clear-edit-resource-tab",
-];
-
 const telemetryWhiteListForFunctionsInjectable = getInjectable({
   id: "telemetry-white-list-for-functions",
   instantiate: () => [
@@ -119,8 +110,6 @@ const telemetryWhiteListForFunctionsInjectable = getInjectable({
     ...externalActions,
     ...uiInteraction,
     ...terminal,
-    ...logs,
-    ...resourceEditor,
   ],
   decorable: false,
 });
diff --git a/src/features/top-bar/extension-api/__snapshots__/extendability-using-extension-api.test.tsx.snap b/src/features/top-bar/extension-api/__snapshots__/extendability-using-extension-api.test.tsx.snap
new file mode 100644
index 0000000000..69f2e93e1a
--- /dev/null
+++ b/src/features/top-bar/extension-api/__snapshots__/extendability-using-extension-api.test.tsx.snap
@@ -0,0 +1,890 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`extendability-using-extension-api given an extension with a weakly typed and invalid top-bar item is enabled renders without blowing up 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
+        >
+          <div
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
+          >
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to some-product-name!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
+
+exports[`extendability-using-extension-api given an extension with top-bar items is enabled renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <div
+              data-testid="some-top-bar-item"
+            >
+              Some-content
+            </div>
+          </div>
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
+        >
+          <div
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
+          >
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to some-product-name!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
+
+exports[`extendability-using-extension-api given an extension with top-bar items is enabled when the extension is disabled renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
+        >
+          <div
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
+          >
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to some-product-name!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
+
+exports[`extendability-using-extension-api renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="home-button"
+            >
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
+          >
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
+        </div>
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
+        >
+          <div
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
+          >
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to some-product-name!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+        data-testid="status-bar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        />
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
diff --git a/src/features/top-bar/extension-api/extendability-using-extension-api.test.tsx b/src/features/top-bar/extension-api/extendability-using-extension-api.test.tsx
new file mode 100644
index 0000000000..70a06574a7
--- /dev/null
+++ b/src/features/top-bar/extension-api/extendability-using-extension-api.test.tsx
@@ -0,0 +1,108 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import type { RenderResult } from "@testing-library/react";
+
+import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
+import type { FakeExtensionOptions } from "../../../renderer/components/test-utils/get-extension-fake";
+
+describe("extendability-using-extension-api", () => {
+  let rendered: RenderResult;
+  let applicationBuilder: ApplicationBuilder;
+
+  beforeEach(async () => {
+    applicationBuilder = getApplicationBuilder();
+
+    rendered = await applicationBuilder.render();
+  });
+
+  it("renders", () => {
+    expect(rendered.baseElement).toMatchSnapshot();
+  });
+
+  it("given an extension with top-bar items has not been enabled yet, does not render the top-bar item", () => {
+    expect(rendered.queryByTestId("some-top-bar-item")).not.toBeInTheDocument();
+  });
+
+  describe("given an extension with top-bar items is enabled", () => {
+    let testExtension: FakeExtensionOptions;
+
+    beforeEach(() => {
+      testExtension = {
+        id: "test-extension",
+        name: "Test Extension",
+
+        rendererOptions: {
+          topBarItems: [
+            {
+              components: {
+                Item: () => (
+                  <div data-testid="some-top-bar-item">Some-content</div>
+                ),
+              },
+            },
+          ],
+        },
+      };
+
+      applicationBuilder.extensions.enable(testExtension);
+    });
+
+    it("renders", () => {
+      expect(rendered.baseElement).toMatchSnapshot();
+    });
+
+    it("renders the top-bar item", () => {
+      expect(rendered.getByTestId("some-top-bar-item")).toBeInTheDocument();
+    });
+
+    describe("when the extension is disabled", () => {
+      beforeEach(() => {
+        applicationBuilder.extensions.disable(testExtension);
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("no longer renders the top-bar item", () => {
+        expect(rendered.queryByTestId("some-top-bar-item")).not.toBeInTheDocument();
+      });
+    });
+  });
+
+  describe("given an extension with a weakly typed and invalid top-bar item is enabled", () => {
+    beforeEach(() => {
+      const testExtension: FakeExtensionOptions = {
+        id: "test-extension",
+        name: "Test Extension",
+
+        rendererOptions: {
+          topBarItems: [
+            {
+              components: {
+                // Note: this makes the item invalid.
+                Item: undefined,
+              },
+            } as any,
+
+            // Note: empty object makes the item invalid.
+            {} as any,
+
+            // Note: non-object makes the item invalid.
+            undefined as any,
+          ],
+        },
+      };
+
+      applicationBuilder.extensions.enable(testExtension);
+    });
+
+    it("renders without blowing up", () => {
+      expect(rendered.baseElement).toMatchSnapshot();
+    });
+  });
+});
diff --git a/src/features/top-bar/extension-api/renderer/legacy-extension-api-registrator-for-top-bar-items.injectable.ts b/src/features/top-bar/extension-api/renderer/legacy-extension-api-registrator-for-top-bar-items.injectable.ts
new file mode 100644
index 0000000000..8eef409b1a
--- /dev/null
+++ b/src/features/top-bar/extension-api/renderer/legacy-extension-api-registrator-for-top-bar-items.injectable.ts
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { reject } from "lodash/fp";
+import { extensionRegistratorInjectionToken } from "../../../../extensions/extension-loader/extension-registrator-injection-token";
+import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension";
+import { pipeline } from "@ogre-tools/fp";
+import { topBarItemOnRightSideInjectionToken } from "../../../../renderer/components/layout/top-bar/top-bar-items/top-bar-item-injection-token";
+import { computed } from "mobx";
+
+const legacyExtensionApiRegistratorForTopBarItemsInjectable = getInjectable({
+  id: "legacy-extension-api-registrator-for-top-bar-items",
+
+  instantiate: () => (ext) => {
+    const extension = ext as LensRendererExtension;
+
+    return pipeline(
+      extension.topBarItems,
+
+      reject((registration) => !registration?.components?.Item),
+
+      (validTopBarRegistrations) =>
+        validTopBarRegistrations.map((registration, index) => {
+          const id = `extension-top-bar-item-for-${extension.sanitizedExtensionId}-${index}`;
+
+          return getInjectable({
+            id,
+
+            injectionToken: topBarItemOnRightSideInjectionToken,
+
+            instantiate: () => ({
+              id,
+              isShown: computed(() => true),
+              // Note: legacy extension-API does not specify order of top-bar items, and therefore an arbitrary number is used. This makes items originating from extension appear in volatile order between each other.
+              orderNumber: 100,
+              Component: registration.components.Item,
+            }),
+          });
+        }),
+    );
+  },
+
+  injectionToken: extensionRegistratorInjectionToken,
+});
+
+export default legacyExtensionApiRegistratorForTopBarItemsInjectable;
diff --git a/src/features/tray/clicking-tray-menu-item-originating-from-extension.test.ts b/src/features/tray/clicking-tray-menu-item-originating-from-extension.test.ts
index e7003dd3e2..4ba4ecbcd7 100644
--- a/src/features/tray/clicking-tray-menu-item-originating-from-extension.test.ts
+++ b/src/features/tray/clicking-tray-menu-item-originating-from-extension.test.ts
@@ -4,10 +4,9 @@
  */
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import loggerInjectable from "../../common/logger.injectable";
-import type { Logger } from "../../common/logger";
 import type { FakeExtensionOptions } from "../../renderer/components/test-utils/get-extension-fake";
 import getRandomIdInjectable from "../../common/utils/get-random-id.injectable";
+import logErrorInjectable from "../../common/log-error.injectable";
 
 describe("clicking tray menu item originating from extension", () => {
   let builder: ApplicationBuilder;
@@ -19,7 +18,7 @@ describe("clicking tray menu item originating from extension", () => {
     builder.beforeApplicationStart((mainDi) => {
       logErrorMock = jest.fn();
 
-      mainDi.override(loggerInjectable, () => ({ error: logErrorMock }) as unknown as Logger);
+      mainDi.override(logErrorInjectable, () => logErrorMock);
       mainDi.override(getRandomIdInjectable, () => () => "some-random-id");
     });
 
diff --git a/src/features/tray/extension-adding-tray-items.test.tsx b/src/features/tray/extension-adding-tray-items.test.tsx
index 5d2efbe37b..2b640be07c 100644
--- a/src/features/tray/extension-adding-tray-items.test.tsx
+++ b/src/features/tray/extension-adding-tray-items.test.tsx
@@ -2,13 +2,14 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { IObservableValue } from "mobx";
+import type { IObservableArray, IObservableValue } from "mobx";
 import { computed, runInAction, observable } from "mobx";
+import type { TrayMenuRegistration } from "../../main/tray/tray-menu-registration";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 
 describe("preferences: extension adding tray items", () => {
-  describe("when extension with tray items is enabled", () => {
+  describe("when extension with tray items are statically defined", () => {
     let builder: ApplicationBuilder;
     let someObservableForVisibility: IObservableValue<boolean>;
     let someObservableForEnabled: IObservableValue<boolean>;
@@ -190,4 +191,88 @@ describe("preferences: extension adding tray items", () => {
       expect(item?.enabled).toBe(false);
     });
   });
+
+  describe("when extension with tray items are dynamically defined", () => {
+    let builder: ApplicationBuilder;
+    let menuItems: IObservableArray<TrayMenuRegistration>;
+
+    beforeEach(async () => {
+      builder = getApplicationBuilder();
+
+      await builder.render();
+
+      builder.preferences.navigate();
+
+      menuItems = observable.array([
+        {
+          id: "some-visible",
+          label: "some-visible",
+          click: () => {},
+          visible: computed(() => true),
+        },
+      ]);
+
+      const computedTrayMenu = computed(() => menuItems);
+
+      const testExtension = {
+        id: "some-extension-id",
+        name: "some-extension",
+
+        mainOptions: {
+          trayMenus: computedTrayMenu,
+        },
+      };
+
+      builder.extensions.enable(testExtension);
+    });
+
+    it("given item exists, it's shown", () => {
+      expect(
+        builder.tray.get(
+          "some-visible-tray-menu-item-for-extension-some-extension",
+        ),
+      ).not.toBeNull();
+    });
+
+    it("given item is added, it's shown", async () => {
+      menuItems.push({
+        id: "some-added",
+        label: "some-added",
+        click: () => {},
+        visible: computed(() => true),
+      });
+
+      expect(
+        builder.tray.get(
+          "some-added-tray-menu-item-for-extension-some-extension",
+        ),
+      ).not.toBeNull();
+    });
+
+    it("given item is removed, it's not shown", async () => {
+      menuItems.replace([]);
+
+      expect(
+        builder.tray.get(
+          "some-visible-tray-menu-item-for-extension-some-extension",
+        ),
+      ).toBeNull();
+    });
+
+    it("given items are removed and one added, it's shown", async () => {
+      menuItems.replace([]);
+      menuItems.push({
+        id: "some-added",
+        label: "some-added",
+        click: () => {},
+        visible: computed(() => true),
+      });
+
+      expect(
+        builder.tray.get(
+          "some-added-tray-menu-item-for-extension-some-extension",
+        ),
+      ).not.toBeNull();
+    });
+  });
 });
diff --git a/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
index acbf6c0515..24bb828996 100644
--- a/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/features/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -11,44 +11,61 @@ exports[`welcome - navigation using application menu renders 1`] = `
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="home-button"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -77,7 +94,7 @@ exports[`welcome - navigation using application menu renders 1`] = `
               style="width: 320px;"
             >
               <h2>
-                Welcome to OpenLens!
+                Welcome to some-product-name!
               </h2>
               <p>
                 To get you started we have auto-detected your clusters in your
@@ -183,6 +200,7 @@ exports[`welcome - navigation using application menu renders 1`] = `
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
@@ -212,44 +230,62 @@ exports[`welcome - navigation using application menu when navigated somewhere el
         <div
           class="items"
         >
-          <i
-            class="Icon material interactive focusable"
-            data-testid="home-button"
-            tabindex="0"
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="home"
+            <i
+              class="Icon material interactive focusable"
+              data-testid="home-button"
+              tabindex="0"
             >
-              home
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-back"
+              <span
+                class="icon"
+                data-icon-name="home"
+              >
+                home
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_back"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-back"
             >
-              arrow_back
-            </span>
-          </i>
-          <i
-            class="Icon material interactive disabled focusable"
-            data-testid="history-forward"
+              <span
+                class="icon"
+                data-icon-name="arrow_back"
+              >
+                arrow_back
+              </span>
+            </i>
+          </div>
+          <div
+            class="size-sm"
+          />
+          <div
+            class="preventedDragging"
           >
-            <span
-              class="icon"
-              data-icon-name="arrow_forward"
+            <i
+              class="Icon material interactive disabled focusable"
+              data-testid="history-forward"
             >
-              arrow_forward
-            </span>
-          </i>
+              <span
+                class="icon"
+                data-icon-name="arrow_forward"
+              >
+                arrow_forward
+              </span>
+            </i>
+          </div>
+          <div
+            class="separator"
+          />
         </div>
-        <div
-          class="items"
-        />
       </div>
       <main>
         <div
@@ -257,7 +293,6 @@ exports[`welcome - navigation using application menu when navigated somewhere el
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="application-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -269,68 +304,72 @@ exports[`welcome - navigation using application menu when navigated somewhere el
                 class="Tabs flex column"
               >
                 <div
-                  class="header"
-                >
-                  Preferences
-                </div>
-                <div
-                  class="Tab flex gaps align-center active"
-                  data-testid="tab-link-for-application"
-                  role="tab"
-                  tabindex="0"
+                  data-preference-tab-group-test="general-tab-group"
                 >
                   <div
-                    class="label"
+                    class="header flex items-center"
                   >
-                    App
+                    Preferences
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-proxy"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center active"
+                    data-preference-tab-link-test="app"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Proxy
+                    <div
+                      class="label"
+                    >
+                      App
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-kubernetes"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="proxy"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Kubernetes
+                    <div
+                      class="label"
+                    >
+                      Proxy
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-editor"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="kubernetes"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Editor
+                    <div
+                      class="label"
+                    >
+                      Kubernetes
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="Tab flex gaps align-center"
-                  data-testid="tab-link-for-terminal"
-                  role="tab"
-                  tabindex="0"
-                >
                   <div
-                    class="label"
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="editor"
+                    role="tab"
+                    tabindex="0"
                   >
-                    Terminal
+                    <div
+                      class="label"
+                    >
+                      Editor
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-preference-tab-link-test="terminal"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      Terminal
+                    </div>
                   </div>
                 </div>
               </div>
@@ -344,400 +383,429 @@ exports[`welcome - navigation using application menu when navigated somewhere el
               class="content"
             >
               <section
-                id="application"
+                data-preference-page-test="application-page"
+                id="application-page"
               >
                 <h2
-                  data-testid="application-header"
+                  data-preference-page-title-test="true"
                 >
                   Application
                 </h2>
-                <section
-                  id="appearance"
+                <div
+                  data-preference-item-test="theme"
                 >
-                  <div
-                    class="SubTitle"
+                  <section
+                    id="appearance"
                   >
-                    Theme
-                     
-                  </div>
-                  <div
-                    class="Select theme-lens css-b62m3t-container"
-                  >
-                    <span
-                      class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-theme-input-live-region"
-                    />
-                    <span
-                      aria-atomic="false"
-                      aria-live="polite"
-                      aria-relevant="additions text"
-                      class="css-1f43avz-a11yText-A11yText"
-                    />
                     <div
-                      class="Select__control css-1s2u09g-control"
+                      class="SubTitle"
                     >
+                      Theme
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-theme-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
                       <div
-                        class="Select__value-container css-319lph-ValueContainer"
+                        class="Select__control css-1s2u09g-control"
                       >
                         <div
-                          class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-theme-input-placeholder"
+                          class="Select__value-container css-319lph-ValueContainer"
                         >
-                          Select...
-                        </div>
-                        <div
-                          class="Select__input-container css-6j8wv5-Input"
-                          data-value=""
-                        >
-                          <input
-                            aria-autocomplete="list"
-                            aria-describedby="react-select-theme-input-placeholder"
-                            aria-expanded="false"
-                            aria-haspopup="true"
-                            autocapitalize="none"
-                            autocomplete="off"
-                            autocorrect="off"
-                            class="Select__input"
-                            id="theme-input"
-                            role="combobox"
-                            spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                            tabindex="0"
-                            type="text"
-                            value=""
-                          />
-                        </div>
-                      </div>
-                      <div
-                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                      >
-                        <span
-                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                        />
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="css-tj5bde-Svg"
-                            focusable="false"
-                            height="20"
-                            viewBox="0 0 20 20"
-                            width="20"
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-theme-input-placeholder"
                           >
-                            <path
-                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-theme-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="theme-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
                             />
-                          </svg>
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="extensionRegistryUrl"
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="extension-install-registry"
                 >
-                  <div
-                    class="SubTitle"
+                  <section
+                    id="extensionRegistryUrl"
                   >
-                    Extension Install Registry
-                     
-                  </div>
-                  <div
-                    class="Select theme-lens css-b62m3t-container"
-                  >
-                    <span
-                      class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-extension-install-registry-input-live-region"
-                    />
-                    <span
-                      aria-atomic="false"
-                      aria-live="polite"
-                      aria-relevant="additions text"
-                      class="css-1f43avz-a11yText-A11yText"
-                    />
                     <div
-                      class="Select__control css-1s2u09g-control"
+                      class="SubTitle"
                     >
+                      Extension Install Registry
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-extension-install-registry-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
                       <div
-                        class="Select__value-container css-319lph-ValueContainer"
+                        class="Select__control css-1s2u09g-control"
                       >
                         <div
-                          class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-extension-install-registry-input-placeholder"
+                          class="Select__value-container css-319lph-ValueContainer"
                         >
-                          Select...
-                        </div>
-                        <div
-                          class="Select__input-container css-6j8wv5-Input"
-                          data-value=""
-                        >
-                          <input
-                            aria-autocomplete="list"
-                            aria-describedby="react-select-extension-install-registry-input-placeholder"
-                            aria-expanded="false"
-                            aria-haspopup="true"
-                            autocapitalize="none"
-                            autocomplete="off"
-                            autocorrect="off"
-                            class="Select__input"
-                            id="extension-install-registry-input"
-                            role="combobox"
-                            spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                            tabindex="0"
-                            type="text"
-                            value=""
-                          />
-                        </div>
-                      </div>
-                      <div
-                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                      >
-                        <span
-                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                        />
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="css-tj5bde-Svg"
-                            focusable="false"
-                            height="20"
-                            viewBox="0 0 20 20"
-                            width="20"
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-extension-install-registry-input-placeholder"
                           >
-                            <path
-                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-extension-install-registry-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="extension-install-registry-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
                             />
-                          </svg>
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                  <p
-                    class="mt-4 mb-5 leading-relaxed"
-                  >
-                    This setting is to change the registry URL for installing extensions by name. 
-                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                    <b>
-                      .npmrc
-                    </b>
-                     file or in the input below.
-                  </p>
-                  <div
-                    class="Input theme round black disabled invalid"
+                    <p
+                      class="mt-4 mb-5 leading-relaxed"
+                    >
+                      This setting is to change the registry URL for installing extensions by name. 
+                      If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                      <b>
+                        .npmrc
+                      </b>
+                       file or in the input below.
+                    </p>
+                    <div
+                      class="Input theme round black disabled invalid"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="Custom Extension Registry URL..."
+                          spellcheck="false"
+                          value="some-custom-url"
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="start-up"
+                >
+                  <section
+                    id="other"
                   >
+                    <div
+                      class="SubTitle"
+                    >
+                      Start-up
+                       
+                    </div>
                     <label
-                      class="input-area flex gaps align-center"
-                      id=""
+                      class="Switch"
+                      data-testid="switch"
                     >
+                      Automatically start Lens on login
                       <input
-                        class="input box grow"
-                        disabled=""
-                        placeholder="Custom Extension Registry URL..."
-                        spellcheck="false"
-                        value="some-custom-url"
+                        role="switch"
+                        type="checkbox"
                       />
                     </label>
-                    <div
-                      class="input-info flex gaps"
-                    />
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="other"
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="update-channel"
                 >
-                  <div
-                    class="SubTitle"
+                  <section
+                    id="update-channel"
                   >
-                    Start-up
-                     
-                  </div>
-                  <label
-                    class="Switch"
-                    data-testid="switch"
-                  >
-                    Automatically start Lens on login
-                    <input
-                      role="switch"
-                      type="checkbox"
-                    />
-                  </label>
-                </section>
-                <hr />
-                <section
-                  id="update-channel"
-                >
-                  <div
-                    class="SubTitle"
-                  >
-                    Update Channel
-                     
-                  </div>
-                  <div
-                    class="Select theme-lens css-b62m3t-container"
-                  >
-                    <span
-                      class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-update-channel-input-live-region"
-                    />
-                    <span
-                      aria-atomic="false"
-                      aria-live="polite"
-                      aria-relevant="additions text"
-                      class="css-1f43avz-a11yText-A11yText"
-                    />
                     <div
-                      class="Select__control css-1s2u09g-control"
+                      class="SubTitle"
                     >
+                      Update Channel
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-update-channel-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
                       <div
-                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                        class="Select__control css-1s2u09g-control"
                       >
                         <div
-                          class="Select__single-value css-qc6sy-singleValue"
+                          class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
                         >
-                          Stable
-                        </div>
-                        <div
-                          class="Select__input-container css-6j8wv5-Input"
-                          data-value=""
-                        >
-                          <input
-                            aria-autocomplete="list"
-                            aria-expanded="false"
-                            aria-haspopup="true"
-                            autocapitalize="none"
-                            autocomplete="off"
-                            autocorrect="off"
-                            class="Select__input"
-                            id="update-channel-input"
-                            role="combobox"
-                            spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                            tabindex="0"
-                            type="text"
-                            value=""
-                          />
-                        </div>
-                      </div>
-                      <div
-                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                      >
-                        <span
-                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                        />
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="css-tj5bde-Svg"
-                            focusable="false"
-                            height="20"
-                            viewBox="0 0 20 20"
-                            width="20"
+                          <div
+                            class="Select__single-value css-qc6sy-singleValue"
                           >
-                            <path
-                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            Stable
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="update-channel-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
                             />
-                          </svg>
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                </section>
-                <hr />
-                <section
-                  id="locale"
+                  </section>
+                </div>
+                <div
+                  class="HorizontalLine size-xl"
+                />
+                <div
+                  data-preference-item-test="timezone"
                 >
-                  <div
-                    class="SubTitle"
+                  <section
+                    id="locale"
                   >
-                    Locale Timezone
-                     
-                  </div>
-                  <div
-                    class="Select theme-lens css-b62m3t-container"
-                  >
-                    <span
-                      class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-timezone-input-live-region"
-                    />
-                    <span
-                      aria-atomic="false"
-                      aria-live="polite"
-                      aria-relevant="additions text"
-                      class="css-1f43avz-a11yText-A11yText"
-                    />
                     <div
-                      class="Select__control css-1s2u09g-control"
+                      class="SubTitle"
                     >
+                      Locale Timezone
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-timezone-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
                       <div
-                        class="Select__value-container css-319lph-ValueContainer"
+                        class="Select__control css-1s2u09g-control"
                       >
                         <div
-                          class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-timezone-input-placeholder"
+                          class="Select__value-container css-319lph-ValueContainer"
                         >
-                          Select...
-                        </div>
-                        <div
-                          class="Select__input-container css-6j8wv5-Input"
-                          data-value=""
-                        >
-                          <input
-                            aria-autocomplete="list"
-                            aria-describedby="react-select-timezone-input-placeholder"
-                            aria-expanded="false"
-                            aria-haspopup="true"
-                            autocapitalize="none"
-                            autocomplete="off"
-                            autocorrect="off"
-                            class="Select__input"
-                            id="timezone-input"
-                            role="combobox"
-                            spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                            tabindex="0"
-                            type="text"
-                            value=""
-                          />
-                        </div>
-                      </div>
-                      <div
-                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                      >
-                        <span
-                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                        />
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="css-tj5bde-Svg"
-                            focusable="false"
-                            height="20"
-                            viewBox="0 0 20 20"
-                            width="20"
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-timezone-input-placeholder"
                           >
-                            <path
-                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-timezone-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="timezone-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
                             />
-                          </svg>
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                </section>
+                  </section>
+                </div>
               </section>
             </div>
             <div
@@ -822,6 +890,7 @@ exports[`welcome - navigation using application menu when navigated somewhere el
       </div>
       <div
         class="StatusBar"
+        data-testid="status-bar"
       >
         <div
           class="leftSide"
@@ -851,44 +920,61 @@ exports[`welcome - navigation using application menu when navigated somewhere el
       <div
         class="items"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="home-button"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+        </div>
+        <div
+          class="size-sm"
+        />
+        <div
+          class="preventedDragging"
         >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="separator"
+        />
       </div>
-      <div
-        class="items"
-      />
     </div>
     <main>
       <div
@@ -917,7 +1003,7 @@ exports[`welcome - navigation using application menu when navigated somewhere el
               style="width: 320px;"
             >
               <h2>
-                Welcome to OpenLens!
+                Welcome to some-product-name!
               </h2>
               <p>
                 To get you started we have auto-detected your clusters in your
@@ -1023,6 +1109,7 @@ exports[`welcome - navigation using application menu when navigated somewhere el
     </div>
     <div
       class="StatusBar"
+      data-testid="status-bar"
     >
       <div
         class="leftSide"
diff --git a/src/features/welcome/navigation-using-application-menu.test.ts b/src/features/welcome/navigation-using-application-menu.test.ts
index 1be9aa1d3a..02ccf18e40 100644
--- a/src/features/welcome/navigation-using-application-menu.test.ts
+++ b/src/features/welcome/navigation-using-application-menu.test.ts
@@ -29,7 +29,11 @@ describe("welcome - navigation using application menu", () => {
 
   describe("when navigated somewhere else", () => {
     beforeEach(() => {
-      applicationBuilder.applicationMenu.click("root.preferences");
+      applicationBuilder.applicationMenu.click(
+        "root",
+        "mac",
+        "navigate-to-preferences",
+      );
     });
 
     it("renders", () => {
@@ -44,7 +48,11 @@ describe("welcome - navigation using application menu", () => {
 
     describe("when navigated to welcome using application menu", () => {
       beforeEach(() => {
-        applicationBuilder.applicationMenu.click("help.welcome");
+        applicationBuilder.applicationMenu.click(
+          "root",
+          "help",
+          "navigate-to-welcome",
+        );
       });
 
       it("renders", () => {
diff --git a/src/features/welcome/setting-welcome-page.test.tsx b/src/features/welcome/setting-welcome-page.test.tsx
new file mode 100644
index 0000000000..fc5a0fe4a9
--- /dev/null
+++ b/src/features/welcome/setting-welcome-page.test.tsx
@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { RenderResult } from "@testing-library/react";
+import React from "react";
+import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import type { FakeExtensionOptions } from "../../renderer/components/test-utils/get-extension-fake";
+import welcomeRouteConfigInjectable from "../../common/front-end-routing/routes/welcome/welcome-route-config.injectable";
+import welcomeRouteInjectable from "../../common/front-end-routing/routes/welcome/welcome-route.injectable";
+import type { Route } from "../../common/front-end-routing/front-end-route-injection-token";
+
+
+describe("setting-welcome-page", () => {
+  let applicationBuilder: ApplicationBuilder;
+  let rendered : RenderResult;
+  let welcomeRoute: Route;
+
+  beforeEach(() => {
+    applicationBuilder = getApplicationBuilder();
+  });
+
+  describe("given configuration of welcome page route is the default", () => {
+    beforeEach(async () => {
+      applicationBuilder.beforeApplicationStart((mainDi) => {
+        mainDi.override(welcomeRouteConfigInjectable, () => "/welcome");
+      });
+
+      applicationBuilder.beforeWindowStart((windowDi) => {
+        windowDi.override(welcomeRouteConfigInjectable, () => "/welcome");
+      });
+
+      // enable the extension even though the welcomeRoute is not overriden
+      applicationBuilder.extensions.enable(extensionWithWelcomePage);
+      rendered = await applicationBuilder.render();
+
+      const windowDi = applicationBuilder.applicationWindow.only.di;
+
+      welcomeRoute = windowDi.inject(welcomeRouteInjectable);
+    });
+
+    it("sets the default welcome page", () => {
+      expect(welcomeRoute.path).toEqual("/welcome");
+    });
+
+    it("launches to the default welcome page", () => {
+      const welcomePage = rendered.getByTestId("welcome-page");  // from the Welcome component (welcome.tsx)
+
+      expect(welcomePage).toBeInTheDocument();
+    });
+  });
+
+  describe("given configuration of welcome page route is set to a custom page", () => {
+    beforeEach(async () => {
+      applicationBuilder.beforeApplicationStart((mainDi) => {
+        mainDi.override(welcomeRouteConfigInjectable, () => "/extension/some-extension-name/some-welcome-page");
+      });
+
+      applicationBuilder.beforeWindowStart((windowDi) => {
+        windowDi.override(welcomeRouteConfigInjectable, () => "/extension/some-extension-name/some-welcome-page");
+      });
+
+      applicationBuilder.extensions.enable(extensionWithWelcomePage);
+      rendered = await applicationBuilder.render();
+
+      const windowDi = applicationBuilder.applicationWindow.only.di;
+
+      welcomeRoute = windowDi.inject(welcomeRouteInjectable);
+    });
+
+    it("sets the custom welcome page", () => {
+      expect(welcomeRoute.path).toEqual("/extension/some-extension-name/some-welcome-page");
+    });
+
+    it("launches to the custom welcome page ", () => {
+      const welcomePage = rendered.getByTestId("some-welcome-test-id");
+
+      expect(welcomePage).toBeInTheDocument();
+    });
+  });
+});
+
+const extensionWithWelcomePage: FakeExtensionOptions = {
+  id: "some-extension-id",
+  name: "some-extension-name",
+
+  rendererOptions: {
+    globalPages: [
+      {
+        id: "some-welcome-page",
+        components: {
+          Page: () => <div data-testid="some-welcome-test-id">Welcome page</div>,
+        },
+      },
+    ],
+  },
+};
diff --git a/src/jest.setup.ts b/src/jest.setup.ts
index eb1e801f72..69e94c4fb2 100644
--- a/src/jest.setup.ts
+++ b/src/jest.setup.ts
@@ -3,7 +3,6 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import fetchMock from "jest-fetch-mock";
 import configurePackages from "./common/configure-packages";
 import { configure } from "mobx";
 import { setImmediate } from "timers";
@@ -20,9 +19,6 @@ configure({
   safeDescriptors: false,
 });
 
-// rewire global.fetch to call 'fetchMock'
-fetchMock.enableMocks();
-
 // Mock __non_webpack_require__ for tests
 globalThis.__non_webpack_require__ = jest.fn();
 
@@ -58,7 +54,7 @@ const getInjectables = (environment: "renderer" | "main", filePathGlob: string)
   }),
 ].map(x => path.resolve(__dirname, x));
 
-(global as any).rendererInjectablePaths = getInjectables("renderer", "*.injectable.{ts,tsx}");
+(global as any).rendererInjectablePaths = getInjectables("renderer", "*.{injectable,injectable.testing-env}.{ts,tsx}");
 (global as any).rendererGlobalOverridePaths = getInjectables("renderer", "*.global-override-for-injectable.{ts,tsx}");
-(global as any).mainInjectablePaths = getInjectables("main", "*.injectable.{ts,tsx}");
+(global as any).mainInjectablePaths = getInjectables("main", "*.{injectable,injectable.testing-env}.{ts,tsx}");
 (global as any).mainGlobalOverridePaths = getInjectables("main", "*.global-override-for-injectable.{ts,tsx}");
diff --git a/src/main/__test__/cluster.test.ts b/src/main/__test__/cluster.test.ts
index 0244141ab3..980b63c767 100644
--- a/src/main/__test__/cluster.test.ts
+++ b/src/main/__test__/cluster.test.ts
@@ -10,6 +10,7 @@ import { getDiForUnitTesting } from "../getDiForUnitTesting";
 import type { CreateCluster } from "../../common/cluster/create-cluster-injection-token";
 import { createClusterInjectionToken } from "../../common/cluster/create-cluster-injection-token";
 import authorizationReviewInjectable from "../../common/cluster/authorization-review.injectable";
+import authorizationNamespaceReviewInjectable from "../../common/cluster/authorization-namespace-review.injectable";
 import listNamespacesInjectable from "../../common/cluster/list-namespaces.injectable";
 import createContextHandlerInjectable from "../context-handler/create-context-handler.injectable";
 import type { ClusterContextHandler } from "../context-handler/context-handler";
@@ -19,6 +20,8 @@ import directoryForTempInjectable from "../../common/app-paths/directory-for-tem
 import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
 import kubectlBinaryNameInjectable from "../kubectl/binary-name.injectable";
 import kubectlDownloadingNormalizedArchInjectable from "../kubectl/normalized-arch.injectable";
+import { apiResourceRecord, apiResources } from "../../common/rbac";
+import listApiResourcesInjectable from "../../common/cluster/list-api-resources.injectable";
 
 console = new Console(process.stdout, process.stderr); // fix mockFS
 
@@ -39,6 +42,8 @@ describe("create clusters", () => {
     di.override(normalizedPlatformInjectable, () => "darwin");
     di.override(broadcastMessageInjectable, () => async () => {});
     di.override(authorizationReviewInjectable, () => () => () => Promise.resolve(true));
+    di.override(authorizationNamespaceReviewInjectable, () => () => () => Promise.resolve(Object.keys(apiResourceRecord)));
+    di.override(listApiResourcesInjectable, () => () => () => Promise.resolve(apiResources));
     di.override(listNamespacesInjectable, () => () => () => Promise.resolve([ "default" ]));
     di.override(createContextHandlerInjectable, () => (cluster) => ({
       restartServer: jest.fn(),
diff --git a/src/main/__test__/context-handler.test.ts b/src/main/__test__/context-handler.test.ts
index 92e9d5ae25..5d11dbdf70 100644
--- a/src/main/__test__/context-handler.test.ts
+++ b/src/main/__test__/context-handler.test.ts
@@ -3,68 +3,43 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { UserStore } from "../../common/user-store";
 import type { ClusterContextHandler } from "../context-handler/context-handler";
-import type { PrometheusService, PrometheusProviderRegistry } from "../prometheus";
-import { PrometheusProvider } from "../prometheus";
-import mockFs from "mock-fs";
 import { getDiForUnitTesting } from "../getDiForUnitTesting";
 import createContextHandlerInjectable from "../context-handler/create-context-handler.injectable";
 import type { Cluster } from "../../common/cluster/cluster";
 import createKubeAuthProxyInjectable from "../kube-auth-proxy/create-kube-auth-proxy.injectable";
-import prometheusProviderRegistryInjectable from "../prometheus/prometheus-provider-registry.injectable";
-
-jest.mock("electron", () => ({
-  app: {
-    getVersion: () => "99.99.99",
-    getName: () => "lens",
-    setName: jest.fn(),
-    setPath: jest.fn(),
-    getPath: () => "tmp",
-    getLocale: () => "en",
-    setLoginItemSettings: jest.fn(),
-  },
-  ipcMain: {
-    on: jest.fn(),
-    handle: jest.fn(),
-  },
-}));
+import type { DiContainer } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
+import type { PrometheusProvider } from "../prometheus/provider";
+import { prometheusProviderInjectionToken } from "../prometheus/provider";
+import { runInAction } from "mobx";
 
 enum ServiceResult {
   Success,
   Failure,
-  Undefined,
 }
 
-class TestProvider extends PrometheusProvider {
-  name = "TestProvider1";
-  rateAccuracy = "1h";
-  isConfigurable = false;
-
-  constructor(public id: string, public alwaysFail: ServiceResult) {
-    super();
-  }
-
-  getQuery(): string {
+const createTestPrometheusProvider = (kind: string, alwaysFail: ServiceResult): PrometheusProvider => ({
+  kind,
+  name: "TestProvider1",
+  isConfigurable: false,
+  getQuery: () => {
     throw new Error("getQuery is not implemented.");
-  }
-
-  async getPrometheusService(): Promise<PrometheusService | undefined> {
-    switch (this.alwaysFail) {
+  },
+  getPrometheusService: async () => {
+    switch (alwaysFail) {
       case ServiceResult.Success:
         return {
-          id: this.id,
+          kind,
           namespace: "default",
           port: 7000,
           service: "",
         };
       case ServiceResult.Failure:
         throw new Error("does fail");
-      case ServiceResult.Undefined:
-        return undefined;
     }
-  }
-}
+  },
+});
 
 const clusterStub = {
   getProxyKubeconfig: () => ({
@@ -74,53 +49,34 @@ const clusterStub = {
 } as unknown as Cluster;
 
 describe("ContextHandler", () => {
-  let createContextHandler: (cluster: Cluster) => ClusterContextHandler | undefined;
-  let prometheusProviderRegistry: PrometheusProviderRegistry;
+  let createContextHandler: (cluster: Cluster) => ClusterContextHandler;
+  let di: DiContainer;
 
   beforeEach(() => {
-    const di = getDiForUnitTesting({ doGeneralOverrides: true });
-
-    mockFs({
-      "tmp": {},
-    });
-
+    di = getDiForUnitTesting({ doGeneralOverrides: true });
     di.override(createKubeAuthProxyInjectable, () => ({} as any));
 
-    prometheusProviderRegistry = di.inject(prometheusProviderRegistryInjectable);
-
     createContextHandler = di.inject(createContextHandlerInjectable);
   });
 
-  afterEach(() => {
-    UserStore.resetInstance();
-    mockFs.restore();
-  });
-
   describe("getPrometheusService", () => {
     it.each([
-      [0, 0],
-      [0, 1],
-      [0, 2],
-      [0, 3],
-    ])("should throw from %d success(es) after %d failure(s)", async (successes, failures) => {
-      let count = 0;
+      [0],
+      [1],
+      [2],
+      [3],
+    ])("should throw after %d failure(s)", async (failures) => {
+      runInAction(() => {
+        for (let i = 0; i < failures; i += 1) {
+          di.register(getInjectable({
+            id: `test-prometheus-provider-failure-${i}`,
+            injectionToken: prometheusProviderInjectionToken,
+            instantiate: () => createTestPrometheusProvider(`id_failure_${i}`, ServiceResult.Failure),
+          }));
+        }
+      });
 
-      for (let i = 0; i < failures; i += 1) {
-        const serviceResult = i % 2 === 0 ? ServiceResult.Failure : ServiceResult.Undefined;
-
-        prometheusProviderRegistry.registerProvider(new TestProvider(`id_${count++}`, serviceResult));
-      }
-
-      for (let i = 0; i < successes; i += 1) {
-        prometheusProviderRegistry.registerProvider(new TestProvider(`id_${count++}`, ServiceResult.Success));
-      }
-
-      expect(() => {
-        // TODO: Unit test shouldn't access protected or private methods
-        const contextHandler = createContextHandler(clusterStub) as unknown as { getPrometheusService(): Promise<PrometheusService> };
-
-        return contextHandler.getPrometheusService();
-      }).rejects.toBeDefined();
+      expect(() => createContextHandler(clusterStub).getPrometheusDetails()).rejects.toThrowError();
     });
 
     it.each([
@@ -133,24 +89,27 @@ describe("ContextHandler", () => {
       [2, 2],
       [2, 3],
     ])("should pick the first provider of %d success(es) after %d failure(s)", async (successes, failures) => {
-      let count = 0;
+      runInAction(() => {
+        for (let i = 0; i < failures; i += 1) {
+          di.register(getInjectable({
+            id: `test-prometheus-provider-failure-${i}`,
+            injectionToken: prometheusProviderInjectionToken,
+            instantiate: () => createTestPrometheusProvider(`id_failure_${i}`, ServiceResult.Failure),
+          }));
+        }
 
-      for (let i = 0; i < failures; i += 1) {
-        const serviceResult = i % 2 === 0 ? ServiceResult.Failure : ServiceResult.Undefined;
+        for (let i = 0; i < successes; i += 1) {
+          di.register(getInjectable({
+            id: `test-prometheus-provider-success-${i}`,
+            injectionToken: prometheusProviderInjectionToken,
+            instantiate: () => createTestPrometheusProvider(`id_success_${i}`, ServiceResult.Success),
+          }));
+        }
+      });
 
-        prometheusProviderRegistry.registerProvider(new TestProvider(`id_${count++}`, serviceResult));
-      }
+      const details = await createContextHandler(clusterStub).getPrometheusDetails();
 
-      for (let i = 0; i < successes; i += 1) {
-        prometheusProviderRegistry.registerProvider(new TestProvider(`id_${count++}`, ServiceResult.Success));
-      }
-
-      // TODO: Unit test shouldn't access protected or private methods
-      const contextHandler = createContextHandler(clusterStub) as unknown as { getPrometheusService(): Promise<PrometheusService> };
-
-      const service = await contextHandler.getPrometheusService();
-
-      expect(service.id === `id_${failures}`);
+      expect(details.provider.kind === `id_failure_${failures}`);
     });
 
     it.each([
@@ -163,24 +122,27 @@ describe("ContextHandler", () => {
       [2, 2],
       [2, 3],
     ])("should pick the first provider of %d success(es) before %d failure(s)", async (successes, failures) => {
-      let count = 0;
+      runInAction(() => {
+        for (let i = 0; i < failures; i += 1) {
+          di.register(getInjectable({
+            id: `test-prometheus-provider-failure-${i}`,
+            injectionToken: prometheusProviderInjectionToken,
+            instantiate: () => createTestPrometheusProvider(`id_failure_${i}`, ServiceResult.Failure),
+          }));
+        }
 
-      for (let i = 0; i < successes; i += 1) {
-        prometheusProviderRegistry.registerProvider(new TestProvider(`id_${count++}`, ServiceResult.Success));
-      }
+        for (let i = 0; i < successes; i += 1) {
+          di.register(getInjectable({
+            id: `test-prometheus-provider-success-${i}`,
+            injectionToken: prometheusProviderInjectionToken,
+            instantiate: () => createTestPrometheusProvider(`id_success_${i}`, ServiceResult.Success),
+          }));
+        }
+      });
 
-      for (let i = 0; i < failures; i += 1) {
-        const serviceResult = i % 2 === 0 ? ServiceResult.Failure : ServiceResult.Undefined;
+      const details = await createContextHandler(clusterStub).getPrometheusDetails();
 
-        prometheusProviderRegistry.registerProvider(new TestProvider(`id_${count++}`, serviceResult));
-      }
-
-      // TODO: Unit test shouldn't access protected or private methods
-      const contextHandler = createContextHandler(clusterStub) as unknown as { getPrometheusService(): Promise<PrometheusService> };
-
-      const service = await contextHandler.getPrometheusService();
-
-      expect(service.id === "id_0");
+      expect(details.provider.kind === "id_failure_0");
     });
 
     it.each([
@@ -193,45 +155,37 @@ describe("ContextHandler", () => {
       [2, 2],
       [2, 3],
     ])("should pick the first provider of %d success(es) between %d failure(s)", async (successes, failures) => {
-      let count = 0;
       const beforeSuccesses = Math.floor(successes / 2);
-      const afterSuccesses = successes - beforeSuccesses;
 
-      for (let i = 0; i < beforeSuccesses; i += 1) {
-        prometheusProviderRegistry.registerProvider(new TestProvider(`id_${count++}`, ServiceResult.Success));
-      }
+      runInAction(() => {
+        for (let i = 0; i < beforeSuccesses; i += 1) {
+          di.register(getInjectable({
+            id: `test-prometheus-provider-success-${i}`,
+            injectionToken: prometheusProviderInjectionToken,
+            instantiate: () => createTestPrometheusProvider(`id_success_${i}`, ServiceResult.Success),
+          }));
+        }
 
-      for (let i = 0; i < failures; i += 1) {
-        const serviceResult = i % 2 === 0 ? ServiceResult.Failure : ServiceResult.Undefined;
+        for (let i = 0; i < failures; i += 1) {
+          di.register(getInjectable({
+            id: `test-prometheus-provider-failure-${i}`,
+            injectionToken: prometheusProviderInjectionToken,
+            instantiate: () => createTestPrometheusProvider(`id_failure_${i}`, ServiceResult.Failure),
+          }));
+        }
 
-        prometheusProviderRegistry.registerProvider(new TestProvider(`id_${count++}`, serviceResult));
-      }
+        for (let i = beforeSuccesses; i < successes; i += 1) {
+          di.register(getInjectable({
+            id: `test-prometheus-provider-success-${i}`,
+            injectionToken: prometheusProviderInjectionToken,
+            instantiate: () => createTestPrometheusProvider(`id_success_${i}`, ServiceResult.Success),
+          }));
+        }
+      });
 
-      for (let i = 0; i < afterSuccesses; i += 1) {
-        prometheusProviderRegistry.registerProvider(new TestProvider(`id_${count++}`, ServiceResult.Success));
-      }
+      const details = await createContextHandler(clusterStub).getPrometheusDetails();
 
-      // TODO: Unit test shouldn't access protected or private methods
-      const contextHandler = createContextHandler(clusterStub) as unknown as { getPrometheusService(): Promise<PrometheusService> };
-
-      const service = await contextHandler.getPrometheusService();
-
-      expect(service.id === "id_0");
-    });
-
-    it("shouldn't pick the second provider of 2 success(es) after 1 failure(s)", async () => {
-      let count = 0;
-
-      prometheusProviderRegistry.registerProvider(new TestProvider(`id_${count++}`, ServiceResult.Failure));
-      prometheusProviderRegistry.registerProvider(new TestProvider(`id_${count++}`, ServiceResult.Success));
-      prometheusProviderRegistry.registerProvider(new TestProvider(`id_${count++}`, ServiceResult.Success));
-
-      // TODO: Unit test shouldn't access protected or private methods
-      const contextHandler = createContextHandler(clusterStub) as unknown as { getPrometheusService(): Promise<PrometheusService> };
-
-      const service = await contextHandler.getPrometheusService();
-
-      expect(service.id).not.toBe("id_2");
+      expect(details.provider.kind === "id_success_0");
     });
   });
 });
diff --git a/src/main/__test__/kubeconfig-manager.test.ts b/src/main/__test__/kubeconfig-manager.test.ts
index 9cac0063ee..6a33093cb4 100644
--- a/src/main/__test__/kubeconfig-manager.test.ts
+++ b/src/main/__test__/kubeconfig-manager.test.ts
@@ -4,12 +4,7 @@
  */
 import { getDiForUnitTesting } from "../getDiForUnitTesting";
 import { KubeconfigManager } from "../kubeconfig-manager/kubeconfig-manager";
-import mockFs from "mock-fs";
 import type { Cluster } from "../../common/cluster/cluster";
-import fse from "fs-extra";
-import { loadYaml } from "@kubernetes/client-node";
-import { Console } from "console";
-import * as path from "path";
 import createKubeconfigManagerInjectable from "../kubeconfig-manager/create-kubeconfig-manager.injectable";
 import { createClusterInjectionToken } from "../../common/cluster/create-cluster-injection-token";
 import directoryForTempInjectable from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable";
@@ -18,31 +13,53 @@ import type { DiContainer } from "@ogre-tools/injectable";
 import { parse } from "url";
 import loggerInjectable from "../../common/logger.injectable";
 import type { Logger } from "../../common/logger";
-import assert from "assert";
 import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
 import kubectlBinaryNameInjectable from "../kubectl/binary-name.injectable";
 import kubectlDownloadingNormalizedArchInjectable from "../kubectl/normalized-arch.injectable";
-
-console = new Console(process.stdout, process.stderr); // fix mockFS
+import type { ReadFile } from "../../common/fs/read-file.injectable";
+import readFileInjectable from "../../common/fs/read-file.injectable";
+import type { AsyncFnMock } from "@async-fn/jest";
+import asyncFn from "@async-fn/jest";
+import type { WriteFile } from "../../common/fs/write-file.injectable";
+import writeFileInjectable from "../../common/fs/write-file.injectable";
+import type { PathExists } from "../../common/fs/path-exists.injectable";
+import pathExistsInjectable from "../../common/fs/path-exists.injectable";
+import type { DeleteFile } from "../../common/fs/delete-file.injectable";
+import deleteFileInjectable from "../../common/fs/delete-file.injectable";
 
 const clusterServerUrl = "https://192.168.64.3:8443";
 
 describe("kubeconfig manager tests", () => {
   let clusterFake: Cluster;
-  let createKubeconfigManager: (cluster: Cluster) => KubeconfigManager | undefined;
+  let createKubeconfigManager: (cluster: Cluster) => KubeconfigManager;
   let di: DiContainer;
   let loggerMock: jest.Mocked<Logger>;
+  let readFileMock: AsyncFnMock<ReadFile>;
+  let deleteFileMock: AsyncFnMock<DeleteFile>;
+  let writeFileMock: AsyncFnMock<WriteFile>;
+  let pathExistsMock: AsyncFnMock<PathExists>;
+  let kubeConfManager: KubeconfigManager;
+  let ensureServerMock: AsyncFnMock<() => Promise<void>>;
 
   beforeEach(async () => {
     di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    di.override(directoryForTempInjectable, () => "some-directory-for-temp");
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForTempInjectable, () => "/some-directory-for-temp");
+    di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data");
     di.override(kubectlBinaryNameInjectable, () => "kubectl");
     di.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64");
     di.override(normalizedPlatformInjectable, () => "darwin");
 
+    readFileMock = asyncFn();
+    di.override(readFileInjectable, () => readFileMock);
+    writeFileMock = asyncFn();
+    di.override(writeFileInjectable, () => writeFileMock);
+    pathExistsMock = asyncFn();
+    di.override(pathExistsInjectable, () => pathExistsMock);
+    deleteFileMock = asyncFn();
+    di.override(deleteFileInjectable, () => deleteFileMock);
+
     loggerMock = {
       warn: jest.fn(),
       debug: jest.fn(),
@@ -53,29 +70,7 @@ describe("kubeconfig manager tests", () => {
 
     di.override(loggerInjectable, () => loggerMock);
 
-    mockFs({
-      "minikube-config.yml": JSON.stringify({
-        apiVersion: "v1",
-        clusters: [{
-          name: "minikube",
-          cluster: {
-            server: clusterServerUrl,
-          },
-        }],
-        contexts: [{
-          context: {
-            cluster: "minikube",
-            user: "minikube",
-          },
-          name: "minikube",
-        }],
-        users: [{
-          name: "minikube",
-        }],
-        kind: "Config",
-        preferences: {},
-      }),
-    });
+    ensureServerMock = asyncFn();
 
     di.override(createContextHandlerInjectable, () => (cluster) => ({
       restartServer: jest.fn(),
@@ -86,7 +81,7 @@ describe("kubeconfig manager tests", () => {
       resolveAuthProxyCa: jest.fn(),
       resolveAuthProxyUrl: jest.fn(),
       setupPrometheus: jest.fn(),
-      ensureServer: jest.fn(),
+      ensureServer: ensureServerMock,
     }));
 
     const createCluster = di.inject(createClusterInjectionToken);
@@ -96,48 +91,222 @@ describe("kubeconfig manager tests", () => {
     clusterFake = createCluster({
       id: "foo",
       contextName: "minikube",
-      kubeConfigPath: "minikube-config.yml",
+      kubeConfigPath: "/minikube-config.yml",
     }, {
       clusterServerUrl,
     });
 
     jest.spyOn(KubeconfigManager.prototype, "resolveProxyUrl", "get").mockReturnValue("http://127.0.0.1:9191/foo");
+
+    kubeConfManager = createKubeconfigManager(clusterFake);
   });
 
-  afterEach(() => {
-    mockFs.restore();
+  describe("when calling clear", () => {
+    it("should resolve immediately", async () => {
+      await kubeConfManager.clear();
+    });
+
+    it("being called several times shouldn't throw", async () => {
+      await kubeConfManager.clear();
+      await kubeConfManager.clear();
+      await kubeConfManager.clear();
+    });
   });
 
-  it("should create 'temp' kube config with proxy", async () => {
-    const kubeConfManager = createKubeconfigManager(clusterFake);
+  describe("when getPath() is called initially", () => {
+    let getPathPromise: Promise<string>;
 
-    assert(kubeConfManager, "should actually create one");
+    beforeEach(async () => {
+      getPathPromise = kubeConfManager.getPath();
+    });
 
-    expect(loggerMock.error).not.toBeCalled();
-    expect(await kubeConfManager.getPath()).toBe(`some-directory-for-temp${path.sep}kubeconfig-foo`);
-    // this causes an intermittent "ENXIO: no such device or address, read" error
-    //    const file = await fse.readFile(await kubeConfManager.getPath());
-    const file = fse.readFileSync(await kubeConfManager.getPath());
-    const yml = loadYaml<any>(file.toString());
+    it("should not call pathExists()", () => {
+      expect(pathExistsMock).not.toBeCalled();
+    });
 
-    expect(yml["current-context"]).toBe("minikube");
-    expect(yml["clusters"][0]["cluster"]["server"].endsWith("/foo")).toBe(true);
-    expect(yml["users"][0]["name"]).toBe("proxy");
-  });
+    it("should call ensureServer on the cluster context", () => {
+      expect(ensureServerMock).toBeCalledTimes(1);
+    });
 
-  it("should remove 'temp' kube config on unlink and remove reference from inside class", async () => {
-    const kubeConfManager = createKubeconfigManager(clusterFake);
+    describe("when ensureServer resolves", () => {
+      beforeEach(async () => {
+        await ensureServerMock.resolve();
 
-    assert(kubeConfManager, "should actually create one");
+        // clear state of calls
+        ensureServerMock.mock.calls.length = 0;
+      });
 
-    const configPath = await kubeConfManager.getPath();
+      describe("when reading cluster's kubeconfig resolves", () => {
+        beforeEach(async () => {
+          await readFileMock.resolveSpecific(
+            ["/minikube-config.yml"],
+            JSON.stringify({
+              apiVersion: "v1",
+              clusters: [{
+                name: "minikube",
+                cluster: {
+                  server: clusterServerUrl,
+                },
+              }],
+              contexts: [{
+                context: {
+                  cluster: "minikube",
+                  user: "minikube",
+                },
+                name: "minikube",
+              }],
+              users: [{
+                name: "minikube",
+              }],
+              kind: "Config",
+              preferences: {},
+            }),
+          );
+        });
 
-    expect(await fse.pathExists(configPath)).toBe(true);
-    await kubeConfManager.clear();
-    expect(await fse.pathExists(configPath)).toBe(false);
-    await kubeConfManager.clear(); // doesn't throw
-    expect(async () => {
-      await kubeConfManager.getPath();
-    }).rejects.toThrow("already unlinked");
+        describe("when writing out new proxy kubeconfig resolves", () => {
+          beforeEach(async () => {
+            await writeFileMock.resolveSpecific(
+              ["/some-directory-for-temp/kubeconfig-foo", "apiVersion: v1\nkind: Config\npreferences: {}\ncurrent-context: minikube\nclusters:\n  - name: minikube\n    cluster:\n      server: http://127.0.0.1:9191/foo\ncontexts:\n  - name: minikube\n    context:\n      cluster: minikube\n      user: proxy\nusers:\n  - name: proxy\n    user: {}\n"],
+            );
+          });
+
+          it("should allow getPath to resolve with the path to the kubeconfig", async () => {
+            expect(await getPathPromise).toBe("/some-directory-for-temp/kubeconfig-foo");
+          });
+
+          describe("when calling clear", () => {
+            let clearPromise: Promise<void>;
+
+            beforeEach(() => {
+              clearPromise = kubeConfManager.clear();
+            });
+
+            it("should call deleteFile", () => {
+              expect(deleteFileMock).toBeCalledTimes(1);
+            });
+
+            describe("when deleteFile resolves", () => {
+              beforeEach(async () => {
+                await deleteFileMock.resolveSpecific(
+                  ["/some-directory-for-temp/kubeconfig-foo"],
+                );
+              });
+
+              it("should allow clear to resolve", async () => {
+                await clearPromise;
+              });
+            });
+
+            describe("when deleteFile rejects with ENOENT", () => {
+              beforeEach(async () => {
+                await deleteFileMock.resolveSpecific(
+                  ["/some-directory-for-temp/kubeconfig-foo"],
+                  Promise.reject(Object.assign(new Error("file not found"), {
+                    code: "ENOENT",
+                  })),
+                );
+              });
+
+              it("should allow clear to resolve", async () => {
+                await clearPromise;
+              });
+            });
+
+            it("when deleteFile rejects with some other error; clear should also reject", async () => {
+              const expectPromise = expect(clearPromise).rejects.toBeDefined();
+
+              await deleteFileMock.reject(new Error("some other error"));
+              await expectPromise;
+            });
+          });
+
+          describe("when calling getPath a second time", () => {
+            let getPathPromise: Promise<string>;
+
+            beforeEach(async () => {
+              getPathPromise = kubeConfManager.getPath();
+            });
+
+            it("should call pathExists", () => {
+              expect(pathExistsMock).toBeCalledTimes(1);
+            });
+
+            describe("when pathExists resoves to true", () => {
+              beforeEach(async () => {
+                await pathExistsMock.resolveSpecific(
+                  ["/some-directory-for-temp/kubeconfig-foo"],
+                  true,
+                );
+              });
+
+              it("always getPath to resolve with path", async () => {
+                expect(await getPathPromise).toBe("/some-directory-for-temp/kubeconfig-foo");
+              });
+            });
+
+            describe("when pathExists resoves to false", () => {
+              beforeEach(async () => {
+                await pathExistsMock.resolveSpecific(
+                  ["/some-directory-for-temp/kubeconfig-foo"],
+                  false,
+                );
+              });
+
+              it("should call ensureServer on the cluster context", () => {
+                expect(ensureServerMock).toBeCalledTimes(1);
+              });
+
+              describe("when ensureServer resolves", () => {
+                beforeEach(async () => {
+                  await ensureServerMock.resolve();
+                });
+
+                describe("when reading cluster's kubeconfig resolves", () => {
+                  beforeEach(async () => {
+                    await readFileMock.resolveSpecific(
+                      ["/minikube-config.yml"],
+                      JSON.stringify({
+                        apiVersion: "v1",
+                        clusters: [{
+                          name: "minikube",
+                          cluster: {
+                            server: clusterServerUrl,
+                          },
+                        }],
+                        contexts: [{
+                          context: {
+                            cluster: "minikube",
+                            user: "minikube",
+                          },
+                          name: "minikube",
+                        }],
+                        users: [{
+                          name: "minikube",
+                        }],
+                        kind: "Config",
+                        preferences: {},
+                      }),
+                    );
+                  });
+
+                  describe("when writing out new proxy kubeconfig resolves", () => {
+                    beforeEach(async () => {
+                      await writeFileMock.resolveSpecific(
+                        ["/some-directory-for-temp/kubeconfig-foo", "apiVersion: v1\nkind: Config\npreferences: {}\ncurrent-context: minikube\nclusters:\n  - name: minikube\n    cluster:\n      server: http://127.0.0.1:9191/foo\ncontexts:\n  - name: minikube\n    context:\n      cluster: minikube\n      user: proxy\nusers:\n  - name: proxy\n    user: {}\n"],
+                      );
+                    });
+
+                    it("should allow getPath to resolve with the path to the kubeconfig", async () => {
+                      expect(await getPathPromise).toBe("/some-directory-for-temp/kubeconfig-foo");
+                    });
+                  });
+                });
+              });
+            });
+          });
+        });
+      });
+    });
   });
 });
diff --git a/src/main/__test__/shell-session.test.ts b/src/main/__test__/shell-session.test.ts
index 1fe8915e26..c8c0f1c8df 100644
--- a/src/main/__test__/shell-session.test.ts
+++ b/src/main/__test__/shell-session.test.ts
@@ -7,14 +7,14 @@ import { clearKubeconfigEnvVars } from "../utils/clear-kube-env-vars";
 
 describe("clearKubeconfigEnvVars tests", () => {
   it("should not touch non kubeconfig keys", () => {
-    expect(clearKubeconfigEnvVars({ a: 1 })).toStrictEqual({ a: 1 });
+    expect(clearKubeconfigEnvVars({ a: "22" })).toStrictEqual({ a: "22" });
   });
 
   it("should remove a single kubeconfig key", () => {
-    expect(clearKubeconfigEnvVars({ a: 1, kubeconfig: "1" })).toStrictEqual({ a: 1 });
+    expect(clearKubeconfigEnvVars({ a: "22", kubeconfig: "1" })).toStrictEqual({ a: "22" });
   });
 
   it("should remove a two kubeconfig key", () => {
-    expect(clearKubeconfigEnvVars({ a: 1, kubeconfig: "1", kUbeconfig: "1" })).toStrictEqual({ a: 1 });
+    expect(clearKubeconfigEnvVars({ a: "22", kubeconfig: "1", kUbeconfig: "1" })).toStrictEqual({ a: "22" });
   });
 });
diff --git a/src/main/__test__/static-file-route.test.ts b/src/main/__test__/static-file-route.test.ts
index 217d1effd2..4880009017 100644
--- a/src/main/__test__/static-file-route.test.ts
+++ b/src/main/__test__/static-file-route.test.ts
@@ -4,7 +4,7 @@
  */
 
 import type { LensApiRequest, Route } from "../router/route";
-import staticFileRouteInjectable from "../routes/static-file-route.injectable";
+import staticFileRouteInjectable from "../routes/files/static-file-route.injectable";
 import { getDiForUnitTesting } from "../getDiForUnitTesting";
 
 jest.mock("electron", () => ({
diff --git a/src/main/app-paths/app-paths-request-channel-listener.injectable.ts b/src/main/app-paths/app-paths-request-channel-listener.injectable.ts
index 3bd0c95bf7..568d63f1ea 100644
--- a/src/main/app-paths/app-paths-request-channel-listener.injectable.ts
+++ b/src/main/app-paths/app-paths-request-channel-listener.injectable.ts
@@ -2,26 +2,17 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { RequestChannelListener } from "../../common/utils/channel/request-channel-listener-injection-token";
-import { requestChannelListenerInjectionToken } from "../../common/utils/channel/request-channel-listener-injection-token";
-import type { AppPathsChannel } from "../../common/app-paths/app-paths-channel.injectable";
-import appPathsChannelInjectable from "../../common/app-paths/app-paths-channel.injectable";
+import { appPathsChannel } from "../../common/app-paths/app-paths-channel";
 import appPathsInjectable from "../../common/app-paths/app-paths.injectable";
+import { getRequestChannelListenerInjectable } from "../utils/channel/channel-listeners/listener-tokens";
 
-const appPathsRequestChannelListenerInjectable = getInjectable({
-  id: "app-paths-request-channel-listener",
-
-  instantiate: (di): RequestChannelListener<AppPathsChannel> => {
-    const channel = di.inject(appPathsChannelInjectable);
+const appPathsRequestChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: appPathsChannel,
+  handler: (di) => {
     const appPaths = di.inject(appPathsInjectable);
 
-    return {
-      channel,
-      handler: () => appPaths,
-    };
+    return () => appPaths;
   },
-  injectionToken: requestChannelListenerInjectionToken,
 });
 
 export default appPathsRequestChannelListenerInjectable;
diff --git a/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts b/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts
index 8e28c806d7..ca30b690b9 100644
--- a/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts
+++ b/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts
@@ -6,8 +6,6 @@ import electronAppInjectable from "../../electron-app/electron-app.injectable";
 import getElectronAppPathInjectable from "./get-electron-app-path.injectable";
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";
 import type { App } from "electron";
-import joinPathsInjectable from "../../../common/path/join-paths.injectable";
-import { joinPathsFake } from "../../../common/test-utils/join-paths-fake";
 
 describe("get-electron-app-path", () => {
   let getElectronAppPath: (name: string) => string;
@@ -31,7 +29,6 @@ describe("get-electron-app-path", () => {
     } as App;
 
     di.override(electronAppInjectable, () => appStub);
-    di.override(joinPathsInjectable, () => joinPathsFake);
 
     getElectronAppPath = di.inject(getElectronAppPathInjectable) as (name: string) => string;
   });
diff --git a/src/main/app-paths/setup-app-paths.injectable.ts b/src/main/app-paths/setup-app-paths.injectable.ts
index 816c58db8b..c48b35fba9 100644
--- a/src/main/app-paths/setup-app-paths.injectable.ts
+++ b/src/main/app-paths/setup-app-paths.injectable.ts
@@ -6,14 +6,14 @@ import { getInjectable } from "@ogre-tools/injectable";
 import type { AppPaths } from "../../common/app-paths/app-path-injection-token";
 import getElectronAppPathInjectable from "./get-electron-app-path/get-electron-app-path.injectable";
 import setElectronAppPathInjectable from "./set-electron-app-path/set-electron-app-path.injectable";
-import appNameInjectable from "./app-name/app-name.injectable";
 import directoryForIntegrationTestingInjectable from "./directory-for-integration-testing/directory-for-integration-testing.injectable";
 import appPathsStateInjectable from "../../common/app-paths/app-paths-state.injectable";
 import { pathNames } from "../../common/app-paths/app-path-names";
 import { fromPairs, map } from "lodash/fp";
 import { pipeline } from "@ogre-tools/fp";
 import joinPathsInjectable from "../../common/path/join-paths.injectable";
-import { beforeElectronIsReadyInjectionToken } from "../start-main-application/runnable-tokens/before-electron-is-ready-injection-token";
+import appNameInjectable from "../../common/vars/app-name.injectable";
+import { appPathsRunnablePhaseInjectionToken } from "../start-main-application/runnable-tokens/phases";
 
 const setupAppPathsInjectable = getInjectable({
   id: "setup-app-paths",
@@ -27,6 +27,7 @@ const setupAppPathsInjectable = getInjectable({
     const joinPaths = di.inject(joinPathsInjectable);
 
     return {
+      id: "setup-app-paths",
       run: () => {
         if (directoryForIntegrationTesting) {
           setElectronAppPath("appData", directoryForIntegrationTesting);
@@ -43,11 +44,14 @@ const setupAppPathsInjectable = getInjectable({
         ) as AppPaths;
 
         appPathsState.set(appPaths);
+
+        // NOTE: this is the worse of two evils. This makes sure that `RunnableSync` always is sync
+        return undefined;
       },
     };
   },
 
-  injectionToken: beforeElectronIsReadyInjectionToken,
+  injectionToken: appPathsRunnablePhaseInjectionToken,
 });
 
 export default setupAppPathsInjectable;
diff --git a/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts b/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts
deleted file mode 100644
index 08fd1d933d..0000000000
--- a/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { computed } from "mobx";
-import selectedUpdateChannelInjectable from "../../../common/application-update/selected-update-channel/selected-update-channel.injectable";
-import appVersionInjectable from "../../../common/vars/app-version.injectable";
-import { SemVer } from "semver";
-
-const updateCanBeDowngradedInjectable = getInjectable({
-  id: "update-can-be-downgraded",
-
-  instantiate: (di) => {
-    const selectedUpdateChannel = di.inject(selectedUpdateChannelInjectable);
-    const appVersion = di.inject(appVersionInjectable);
-
-    return computed(() => {
-      const semVer = new SemVer(appVersion);
-
-      return (
-        semVer.prerelease[0] !==
-        selectedUpdateChannel.value.get().id
-      );
-    });
-  },
-});
-
-export default updateCanBeDowngradedInjectable;
diff --git a/src/main/application-update/restart-and-install-update/restart-and-install-update-listener.injectable.ts b/src/main/application-update/restart-and-install-update/restart-and-install-update-listener.injectable.ts
deleted file mode 100644
index 0580114885..0000000000
--- a/src/main/application-update/restart-and-install-update/restart-and-install-update-listener.injectable.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import restartAndInstallUpdateChannel from "../../../common/application-update/restart-and-install-update-channel/restart-and-install-update-channel.injectable";
-import { messageChannelListenerInjectionToken } from "../../../common/utils/channel/message-channel-listener-injection-token";
-import quitAndInstallUpdateInjectable from "../quit-and-install-update.injectable";
-
-const restartAndInstallUpdateListenerInjectable = getInjectable({
-  id: "restart-and-install-update-listener",
-
-  instantiate: (di) => {
-    const quitAndInstall = di.inject(quitAndInstallUpdateInjectable);
-    const channel = di.inject(restartAndInstallUpdateChannel);
-
-    return {
-      channel,
-      handler: quitAndInstall,
-    };
-  },
-
-  injectionToken: messageChannelListenerInjectionToken,
-});
-
-export default restartAndInstallUpdateListenerInjectable;
diff --git a/src/main/application-update/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts b/src/main/application-update/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts
deleted file mode 100644
index 12ec2d7c6e..0000000000
--- a/src/main/application-update/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { autorun } from "mobx";
-import { getStartableStoppable } from "../../../common/utils/get-startable-stoppable";
-import setUpdateOnQuitInjectable from "../../electron-app/features/set-update-on-quit.injectable";
-import selectedUpdateChannelInjectable from "../../../common/application-update/selected-update-channel/selected-update-channel.injectable";
-import type { UpdateChannel } from "../../../common/application-update/update-channels";
-import discoveredUpdateVersionInjectable from "../../../common/application-update/discovered-update-version/discovered-update-version.injectable";
-
-const watchIfUpdateShouldHappenOnQuitInjectable = getInjectable({
-  id: "watch-if-update-should-happen-on-quit",
-
-  instantiate: (di) => {
-    const setUpdateOnQuit = di.inject(setUpdateOnQuitInjectable);
-    const selectedUpdateChannel = di.inject(selectedUpdateChannelInjectable);
-    const discoveredVersionState = di.inject(discoveredUpdateVersionInjectable);
-
-    return getStartableStoppable("watch-if-update-should-happen-on-quit", () =>
-      autorun(() => {
-        const sufficientlyStableUpdateChannels =
-          getSufficientlyStableUpdateChannels(selectedUpdateChannel.value.get());
-
-        const discoveredVersion = discoveredVersionState.value.get();
-
-        const updateIsDiscoveredFromChannel = discoveredVersion?.updateChannel;
-
-        const updateOnQuit = updateIsDiscoveredFromChannel
-          ? sufficientlyStableUpdateChannels.includes(
-            updateIsDiscoveredFromChannel,
-          )
-          : false;
-
-        setUpdateOnQuit(updateOnQuit);
-      }),
-    );
-  },
-});
-
-const getSufficientlyStableUpdateChannels = (updateChannel: UpdateChannel): UpdateChannel[] => {
-  if (!updateChannel.moreStableUpdateChannel) {
-    return [updateChannel];
-  }
-
-  return [
-    updateChannel,
-
-    ...getSufficientlyStableUpdateChannels(updateChannel.moreStableUpdateChannel),
-  ];
-};
-
-export default watchIfUpdateShouldHappenOnQuitInjectable;
diff --git a/src/main/build-version/setup-channel.injectable.ts b/src/main/build-version/setup-channel.injectable.ts
new file mode 100644
index 0000000000..05da92db6e
--- /dev/null
+++ b/src/main/build-version/setup-channel.injectable.ts
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { buildVersionChannel } from "../../common/vars/build-semantic-version.injectable";
+import { getRequestChannelListenerInjectable } from "../utils/channel/channel-listeners/listener-tokens";
+import buildVersionInjectable from "../vars/build-version/build-version.injectable";
+
+const buildVersionChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: buildVersionChannel,
+  handler: (di) => {
+    const buildVersion = di.inject(buildVersionInjectable);
+
+    return () => buildVersion.get();
+  },
+});
+
+export default buildVersionChannelListenerInjectable;
diff --git a/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts b/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts
index 08ff464bf2..2998022e67 100644
--- a/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts
+++ b/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts
@@ -3,71 +3,56 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { ObservableMap } from "mobx";
+import { observable, ObservableMap } from "mobx";
 import type { CatalogEntity } from "../../../common/catalog";
 import { loadFromOptions } from "../../../common/kube-helpers";
 import type { Cluster } from "../../../common/cluster/cluster";
-import { computeDiff as computeDiffFor, configToModels } from "../kubeconfig-sync/manager";
-import mockFs from "mock-fs";
-import fs from "fs";
-import clusterStoreInjectable from "../../../common/cluster-store/cluster-store.injectable";
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";
-import { createClusterInjectionToken } from "../../../common/cluster/create-cluster-injection-token";
-import directoryForKubeConfigsInjectable from "../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
-import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable";
-import clusterManagerInjectable from "../../cluster-manager.injectable";
 import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import directoryForTempInjectable from "../../../common/app-paths/directory-for-temp/directory-for-temp.injectable";
-import kubectlBinaryNameInjectable from "../../kubectl/binary-name.injectable";
-import kubectlDownloadingNormalizedArchInjectable from "../../kubectl/normalized-arch.injectable";
-import normalizedPlatformInjectable from "../../../common/vars/normalized-platform.injectable";
-import { iter } from "../../../common/utils";
-import fsInjectable from "../../../common/fs/fs.injectable";
-
-jest.mock("electron", () => ({
-  app: {
-    getVersion: () => "99.99.99",
-    getName: () => "lens",
-    setName: jest.fn(),
-    setPath: jest.fn(),
-    getPath: () => "tmp",
-    getLocale: () => "en",
-    setLoginItemSettings: jest.fn(),
-  },
-  ipcMain: {
-    on: jest.fn(),
-    handle: jest.fn(),
-  },
-}));
+import { iter, strictGet } from "../../../common/utils";
+import type { ComputeKubeconfigDiff } from "../kubeconfig-sync/compute-diff.injectable";
+import computeKubeconfigDiffInjectable from "../kubeconfig-sync/compute-diff.injectable";
+import type { ConfigToModels } from "../kubeconfig-sync/config-to-models.injectable";
+import configToModelsInjectable from "../kubeconfig-sync/config-to-models.injectable";
+import kubeconfigSyncManagerInjectable from "../kubeconfig-sync/manager.injectable";
+import type { KubeconfigSyncManager } from "../kubeconfig-sync/manager";
+import type { KubeconfigSyncValue } from "../../../common/user-store";
+import kubeconfigSyncsInjectable from "../../../common/user-store/kubeconfig-syncs.injectable";
+import getClusterByIdInjectable from "../../../common/cluster-store/get-by-id.injectable";
+import type { DiContainer } from "@ogre-tools/injectable";
+import type { AsyncFnMock } from "@async-fn/jest";
+import type { Stat } from "../../../common/fs/stat/stat.injectable";
+import asyncFn from "@async-fn/jest";
+import statInjectable from "../../../common/fs/stat/stat.injectable";
+import type { Watcher } from "../../../common/fs/watch/watch.injectable";
+import watchInjectable from "../../../common/fs/watch/watch.injectable";
+import EventEmitter from "events";
+import type { ReadStream, Stats } from "fs";
+import createReadFileStreamInjectable from "../../../common/fs/create-read-file-stream.injectable";
 
 describe("kubeconfig-sync.source tests", () => {
-  let computeDiff: ReturnType<typeof computeDiffFor>;
+  let computeKubeconfigDiff: ComputeKubeconfigDiff;
+  let configToModels: ConfigToModels;
+  let kubeconfigSyncs: ObservableMap<string, KubeconfigSyncValue>;
+  let clusters: Map<string, Cluster>;
+  let di: DiContainer;
 
   beforeEach(async () => {
-    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+    di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    mockFs();
+    di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data");
+    di.override(directoryForTempInjectable, () => "/some-directory-for-temp");
 
-    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
-    di.override(directoryForTempInjectable, () => "some-directory-for-temp");
-    di.override(kubectlBinaryNameInjectable, () => "kubectl");
-    di.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64");
-    di.override(normalizedPlatformInjectable, () => "darwin");
+    clusters = new Map();
+    di.override(getClusterByIdInjectable, () => id => clusters.get(id));
 
-    di.permitSideEffects(fsInjectable);
-    di.unoverride(clusterStoreInjectable);
-    di.permitSideEffects(clusterStoreInjectable);
-    di.permitSideEffects(getConfigurationFileModelInjectable);
+    kubeconfigSyncs = observable.map();
 
-    computeDiff = computeDiffFor({
-      directoryForKubeConfigs: di.inject(directoryForKubeConfigsInjectable),
-      createCluster: di.inject(createClusterInjectionToken),
-      clusterManager: di.inject(clusterManagerInjectable),
-    });
-  });
+    di.override(kubeconfigSyncsInjectable, () => kubeconfigSyncs);
 
-  afterEach(() => {
-    mockFs.restore();
+    computeKubeconfigDiff = di.inject(computeKubeconfigDiffInjectable);
+    configToModels = di.inject(configToModelsInjectable);
   });
 
   describe("configsToModels", () => {
@@ -108,13 +93,13 @@ describe("kubeconfig-sync.source tests", () => {
     });
   });
 
-  describe("computeDiff", () => {
+  describe("computeKubeconfigDiff", () => {
     it("should leave an empty source empty if there are no entries", () => {
       const contents = "";
       const rootSource = new ObservableMap<string, [Cluster, CatalogEntity]>();
       const filePath = "/bar";
 
-      computeDiff(contents, rootSource, filePath);
+      computeKubeconfigDiff(contents, rootSource, filePath);
 
       expect(rootSource.size).toBe(0);
     });
@@ -149,9 +134,7 @@ describe("kubeconfig-sync.source tests", () => {
       const rootSource = new ObservableMap<string, [Cluster, CatalogEntity]>();
       const filePath = "/bar";
 
-      fs.writeFileSync(filePath, contents);
-
-      computeDiff(contents, rootSource, filePath);
+      computeKubeconfigDiff(contents, rootSource, filePath);
 
       expect(rootSource.size).toBe(1);
 
@@ -193,9 +176,7 @@ describe("kubeconfig-sync.source tests", () => {
       const rootSource = new ObservableMap<string, [Cluster, CatalogEntity]>();
       const filePath = "/bar";
 
-      fs.writeFileSync(filePath, contents);
-
-      computeDiff(contents, rootSource, filePath);
+      computeKubeconfigDiff(contents, rootSource, filePath);
 
       expect(rootSource.size).toBe(1);
 
@@ -204,7 +185,7 @@ describe("kubeconfig-sync.source tests", () => {
       expect(c.kubeConfigPath).toBe("/bar");
       expect(c.contextName).toBe("context-name");
 
-      computeDiff("{}", rootSource, filePath);
+      computeKubeconfigDiff("{}", rootSource, filePath);
 
       expect(rootSource.size).toBe(0);
     });
@@ -247,9 +228,7 @@ describe("kubeconfig-sync.source tests", () => {
       const rootSource = new ObservableMap<string, [Cluster, CatalogEntity]>();
       const filePath = "/bar";
 
-      fs.writeFileSync(filePath, contents);
-
-      computeDiff(contents, rootSource, filePath);
+      computeKubeconfigDiff(contents, rootSource, filePath);
 
       expect(rootSource.size).toBe(2);
 
@@ -289,7 +268,7 @@ describe("kubeconfig-sync.source tests", () => {
         currentContext: "foobar",
       });
 
-      computeDiff(newContents, rootSource, filePath);
+      computeKubeconfigDiff(newContents, rootSource, filePath);
 
       expect(rootSource.size).toBe(1);
 
@@ -301,4 +280,181 @@ describe("kubeconfig-sync.source tests", () => {
       }
     });
   });
+
+  describe("given a config file at /foobar/config", () => {
+    let manager: KubeconfigSyncManager;
+    let watchInstances: Map<string, Watcher<true>>;
+    let firstReadFoobarConfigSteam: ReadStream;
+    let secondReadFoobarConfigSteam: ReadStream;
+    let statMock: AsyncFnMock<Stat>;
+
+    beforeEach(() => {
+      statMock = asyncFn();
+      di.override(statInjectable, () => statMock);
+
+      watchInstances = new Map();
+      di.override(watchInjectable, () => (path) => {
+        const fakeWatchInstance = getFakeWatchInstance();
+
+        watchInstances.set(path, fakeWatchInstance);
+
+        return fakeWatchInstance;
+      });
+
+      di.override(createReadFileStreamInjectable, () => (filePath) => {
+        if (filePath !== "/foobar/config") {
+          throw new Error(`unexpected file path "${filePath}"`);
+        }
+
+        if (!firstReadFoobarConfigSteam) {
+          return firstReadFoobarConfigSteam = getFakeReadStream(filePath);
+        }
+
+        if (!secondReadFoobarConfigSteam) {
+          return secondReadFoobarConfigSteam = getFakeReadStream(filePath);
+        }
+
+        return getFakeReadStream(filePath);
+      });
+
+      manager = di.inject(kubeconfigSyncManagerInjectable);
+    });
+
+    afterEach(() => {
+      (firstReadFoobarConfigSteam as any) = undefined;
+      (secondReadFoobarConfigSteam as any) = undefined;
+    });
+
+    it("should not find any entities", () => {
+      expect(manager.source.get()).toEqual([]);
+    });
+
+    describe("when sync has started", () => {
+      beforeEach(() => {
+        manager.startSync();
+      });
+
+      it("should not find any entities", () => {
+        expect(manager.source.get()).toEqual([]);
+      });
+
+      describe("when a file sync target for /foobar/config is added", () => {
+        beforeEach(() => {
+          kubeconfigSyncs.set("/foobar/config", {});
+        });
+
+        describe("when stat resolves as not a directory", () => {
+          beforeEach(async () => {
+            await statMock.resolveSpecific(["/foobar/config"], {
+              isDirectory: () => false,
+            } as Stats);
+          });
+
+          describe("when the watch emits that the file is added", () => {
+            beforeEach(() => {
+              strictGet(watchInstances, "/foobar/config").emit("add", "/foobar/config", {
+                size: foobarConfig.length,
+              } as Stats);
+            });
+
+            it("starts to read the file", () => {
+              expect(firstReadFoobarConfigSteam).toBeDefined();
+            });
+
+            describe("when the data is read in", () => {
+              beforeEach(() => {
+                firstReadFoobarConfigSteam.emit("data", Buffer.from(foobarConfig));
+                firstReadFoobarConfigSteam.emit("end");
+                firstReadFoobarConfigSteam.emit("close");
+              });
+
+              it("should find a single entity", () => {
+                expect(manager.source.get().length).toBe(1);
+              });
+
+              describe("when a folder sync target for /foobar is added", () => {
+                beforeEach(() => {
+                  kubeconfigSyncs.set("/foobar", {});
+                });
+
+                describe("when stat resolves as not a directory", () => {
+                  beforeEach(async () => {
+                    await statMock.resolveSpecific(["/foobar"], {
+                      isDirectory: () => true,
+                    } as Stats);
+                  });
+
+                  describe("when the watch emits that the file is added", () => {
+                    beforeEach(() => {
+                      strictGet(watchInstances, "/foobar").emit("add", "/foobar/config", {
+                        size: foobarConfig.length,
+                      } as Stats);
+                    });
+
+                    it("starts to read the file", () => {
+                      expect(secondReadFoobarConfigSteam).toBeDefined();
+                    });
+
+                    describe("when the data is read in", () => {
+                      beforeEach(() => {
+                        secondReadFoobarConfigSteam.emit("data", Buffer.from(foobarConfig));
+                        secondReadFoobarConfigSteam.emit("end");
+                        secondReadFoobarConfigSteam.emit("close");
+                      });
+
+                      it("should still only find a single entity", () => {
+                        expect(manager.source.get().length).toBe(1);
+                      });
+                    });
+                  });
+                });
+              });
+            });
+          });
+        });
+      });
+    });
+  });
+});
+
+const getFakeWatchInstance = (): Watcher<true> => {
+  return Object.assign(new EventEmitter(), {
+    close: jest.fn().mockImplementation(async () => {}),
+  });
+};
+
+const getFakeReadStream = (path: string): ReadStream => {
+  return Object.assign(new EventEmitter(), {
+    path,
+    close: () => {},
+    push: () => true,
+    read: () => {},
+  }) as unknown as ReadStream;
+};
+
+const foobarConfig = JSON.stringify({
+  clusters: [{
+    name: "cluster-name",
+    cluster: {
+      server: "1.2.3.4",
+    },
+    skipTLSVerify: false,
+  }],
+  users: [{
+    name: "user-name",
+  }],
+  contexts: [{
+    name: "context-name",
+    context: {
+      cluster: "cluster-name",
+      user: "user-name",
+    },
+  }, {
+    name: "context-the-second",
+    context: {
+      cluster: "missing-cluster",
+      user: "user-name",
+    },
+  }],
+  currentContext: "foobar",
 });
diff --git a/src/main/catalog-sources/kubeconfig-sync/compute-diff.injectable.ts b/src/main/catalog-sources/kubeconfig-sync/compute-diff.injectable.ts
new file mode 100644
index 0000000000..cb1e62e6e8
--- /dev/null
+++ b/src/main/catalog-sources/kubeconfig-sync/compute-diff.injectable.ts
@@ -0,0 +1,102 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { createHash } from "crypto";
+import type { ObservableMap } from "mobx";
+import { action } from "mobx";
+import { homedir } from "os";
+import directoryForKubeConfigsInjectable from "../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
+import type { CatalogEntity } from "../../../common/catalog";
+import getClusterByIdInjectable from "../../../common/cluster-store/get-by-id.injectable";
+import type { Cluster } from "../../../common/cluster/cluster";
+import { loadConfigFromString } from "../../../common/kube-helpers";
+import clustersThatAreBeingDeletedInjectable from "../../cluster/are-being-deleted.injectable";
+import { catalogEntityFromCluster } from "../../cluster/manager";
+import createClusterInjectable from "../../create-cluster/create-cluster.injectable";
+import configToModelsInjectable from "./config-to-models.injectable";
+import kubeconfigSyncLoggerInjectable from "./logger.injectable";
+
+export type ComputeKubeconfigDiff = (contents: string, source: ObservableMap<string, [Cluster, CatalogEntity]>, filePath: string) => void;
+
+const computeKubeconfigDiffInjectable = getInjectable({
+  id: "compute-kubeconfig-diff",
+  instantiate: (di): ComputeKubeconfigDiff => {
+    const directoryForKubeConfigs = di.inject(directoryForKubeConfigsInjectable);
+    const createCluster = di.inject(createClusterInjectable);
+    const clustersThatAreBeingDeleted = di.inject(clustersThatAreBeingDeletedInjectable);
+    const configToModels = di.inject(configToModelsInjectable);
+    const logger = di.inject(kubeconfigSyncLoggerInjectable);
+    const getClusterById = di.inject(getClusterByIdInjectable);
+
+    return action((contents, source, filePath) => {
+      try {
+        const { config, error } = loadConfigFromString(contents);
+
+        if (error) {
+          logger.warn(`encountered errors while loading config: ${error.message}`, { filePath, details: error.details });
+        }
+
+        const rawModels = configToModels(config, filePath);
+        const models = new Map(rawModels.map(([model, configData]) => [model.contextName, [model, configData] as const]));
+
+        logger.debug(`File now has ${models.size} entries`, { filePath });
+
+        for (const [contextName, value] of source) {
+          const data = models.get(contextName);
+
+          // remove and disconnect clusters that were removed from the config
+          if (!data) {
+            // remove from the deleting set, so that if a new context of the same name is added, it isn't marked as deleting
+            clustersThatAreBeingDeleted.delete(value[0].id);
+
+            value[0].disconnect();
+            source.delete(contextName);
+            logger.debug(`Removed old cluster from sync`, { filePath, contextName });
+            continue;
+          }
+
+          // TODO: For the update check we need to make sure that the config itself hasn't changed.
+          // Probably should make it so that cluster keeps a copy of the config in its memory and
+          // diff against that
+
+          // or update the model and mark it as not needed to be added
+          value[0].updateModel(data[0]);
+          models.delete(contextName);
+          logger.debug(`Updated old cluster from sync`, { filePath, contextName });
+        }
+
+        for (const [contextName, [model, configData]] of models) {
+          // add new clusters to the source
+          try {
+            const clusterId = createHash("md5").update(`${filePath}:${contextName}`).digest("hex");
+            const cluster = getClusterById(clusterId) ?? createCluster({ ...model, id: clusterId }, configData);
+
+            if (!cluster.apiUrl) {
+              throw new Error("Cluster constructor failed, see above error");
+            }
+
+            const entity = catalogEntityFromCluster(cluster);
+
+            if (!filePath.startsWith(directoryForKubeConfigs)) {
+              entity.metadata.labels.file = filePath.replace(homedir(), "~");
+            }
+            source.set(contextName, [cluster, entity]);
+
+            logger.debug(`Added new cluster from sync`, { filePath, contextName });
+          } catch (error) {
+            logger.warn(`Failed to create cluster from model: ${error}`, { filePath, contextName });
+          }
+        }
+      } catch (error) {
+        logger.warn(`Failed to compute diff: ${error}`, { filePath });
+        source.clear(); // clear source if we have failed so as to not show outdated information
+      }
+
+      logger.debug("Finished computing diff", { filePath });
+    });
+  },
+});
+
+export default computeKubeconfigDiffInjectable;
diff --git a/src/main/catalog-sources/kubeconfig-sync/config-to-models.injectable.ts b/src/main/catalog-sources/kubeconfig-sync/config-to-models.injectable.ts
new file mode 100644
index 0000000000..8240d4e914
--- /dev/null
+++ b/src/main/catalog-sources/kubeconfig-sync/config-to-models.injectable.ts
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { KubeConfig } from "@kubernetes/client-node";
+import { getInjectable } from "@ogre-tools/injectable";
+import type { ClusterConfigData, UpdateClusterModel } from "../../../common/cluster-types";
+import { splitConfig } from "../../../common/kube-helpers";
+import kubeconfigSyncLoggerInjectable from "./logger.injectable";
+
+export type ConfigToModels = (rootConfig: KubeConfig, filePath: string) => [UpdateClusterModel, ClusterConfigData][];
+
+const configToModelsInjectable = getInjectable({
+  id: "config-to-models",
+  instantiate: (di): ConfigToModels => {
+    const logger = di.inject(kubeconfigSyncLoggerInjectable);
+
+    return (rootConfig, filePath) => {
+      const validConfigs: ReturnType<ConfigToModels> = [];
+
+      for (const { config, validationResult } of splitConfig(rootConfig)) {
+        if (validationResult.error) {
+          logger.debug(`context failed validation: ${validationResult.error}`, { context: config.currentContext, filePath });
+        } else {
+          validConfigs.push([
+            {
+              kubeConfigPath: filePath,
+              contextName: config.currentContext,
+            },
+            {
+              clusterServerUrl: validationResult.cluster.server,
+            },
+          ]);
+        }
+      }
+
+      return validConfigs;
+    };
+  },
+});
+
+export default configToModelsInjectable;
diff --git a/src/main/catalog-sources/kubeconfig-sync/diff-changed-kubeconfig.injectable.ts b/src/main/catalog-sources/kubeconfig-sync/diff-changed-kubeconfig.injectable.ts
new file mode 100644
index 0000000000..f17293fc2d
--- /dev/null
+++ b/src/main/catalog-sources/kubeconfig-sync/diff-changed-kubeconfig.injectable.ts
@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { Stats } from "fs";
+import { constants } from "fs";
+import type { ObservableMap } from "mobx";
+import type { Readable } from "stream";
+import type { CatalogEntity } from "../../../common/catalog";
+import type { Cluster } from "../../../common/cluster/cluster";
+import createReadFileStreamInjectable from "../../../common/fs/create-read-file-stream.injectable";
+import type { Disposer } from "../../../common/utils";
+import { bytesToUnits, noop } from "../../../common/utils";
+import computeKubeconfigDiffInjectable from "./compute-diff.injectable";
+import kubeconfigSyncLoggerInjectable from "./logger.injectable";
+
+export interface DiffChangedKubeconfigArgs {
+  filePath: string;
+  source: ObservableMap<string, [Cluster, CatalogEntity]>;
+  stats: Stats;
+  maxAllowedFileReadSize: number;
+}
+export type DiffChangedKubeconfig = (args: DiffChangedKubeconfigArgs) => Disposer;
+
+const diffChangedKubeconfigInjectable = getInjectable({
+  id: "diff-changed-kubeconfig",
+  instantiate: (di): DiffChangedKubeconfig => {
+    const computeKubeconfigDiff = di.inject(computeKubeconfigDiffInjectable);
+    const logger = di.inject(kubeconfigSyncLoggerInjectable);
+    const createReadFileStream = di.inject(createReadFileStreamInjectable);
+
+    return ({ filePath, maxAllowedFileReadSize, source, stats }) => {
+      logger.debug(`file changed`, { filePath });
+
+      if (stats.size >= maxAllowedFileReadSize) {
+        logger.warn(`skipping ${filePath}: size=${bytesToUnits(stats.size)} is larger than maxSize=${bytesToUnits(maxAllowedFileReadSize)}`);
+        source.clear();
+
+        return noop;
+      }
+
+      const fileReader = createReadFileStream(filePath, {
+        mode: constants.O_RDONLY,
+      });
+      const readStream = fileReader as Readable;
+      const decoder = new TextDecoder("utf-8", { fatal: true });
+      let fileString = "";
+      let closed = false;
+
+      const cleanup = () => {
+        closed = true;
+        fileReader.close(); // This may not close the stream.
+        // Artificially marking end-of-stream, as if the underlying resource had
+        // indicated end-of-file by itself, allows the stream to close.
+        // This does not cancel pending read operations, and if there is such an
+        // operation, the process may still not be able to exit successfully
+        // until it finishes.
+        fileReader.push(null);
+        fileReader.read(0);
+        readStream.removeAllListeners();
+      };
+
+      readStream
+        .on("data", (chunk: Buffer) => {
+          try {
+            fileString += decoder.decode(chunk, { stream: true });
+          } catch (error) {
+            logger.warn(`skipping ${filePath}: ${error}`);
+            source.clear();
+            cleanup();
+          }
+        })
+        .on("close", () => cleanup())
+        .on("error", error => {
+          cleanup();
+          logger.warn(`failed to read file: ${error}`, { filePath });
+        })
+        .on("end", () => {
+          if (!closed) {
+            computeKubeconfigDiff(fileString, source, filePath);
+          }
+        });
+
+      return cleanup;
+    };
+  },
+});
+
+export default diffChangedKubeconfigInjectable;
diff --git a/src/main/catalog-sources/kubeconfig-sync/logger.injectable.ts b/src/main/catalog-sources/kubeconfig-sync/logger.injectable.ts
new file mode 100644
index 0000000000..4705da78d2
--- /dev/null
+++ b/src/main/catalog-sources/kubeconfig-sync/logger.injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import prefixedLoggerInjectable from "../../../common/logger/prefixed-logger.injectable";
+
+const kubeconfigSyncLoggerInjectable = getInjectable({
+  id: "kubeconfig-sync-logger",
+  instantiate: (di) => di.inject(prefixedLoggerInjectable, "KUBECONFIG-SYNC"),
+});
+
+export default kubeconfigSyncLoggerInjectable;
diff --git a/src/main/catalog-sources/kubeconfig-sync/manager.injectable.ts b/src/main/catalog-sources/kubeconfig-sync/manager.injectable.ts
index f95fa0fb17..06265764c8 100644
--- a/src/main/catalog-sources/kubeconfig-sync/manager.injectable.ts
+++ b/src/main/catalog-sources/kubeconfig-sync/manager.injectable.ts
@@ -5,18 +5,18 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import directoryForKubeConfigsInjectable from "../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
 import { KubeconfigSyncManager } from "./manager";
-import { createClusterInjectionToken } from "../../../common/cluster/create-cluster-injection-token";
-import clusterManagerInjectable from "../../cluster-manager.injectable";
-import catalogEntityRegistryInjectable from "../../catalog/entity-registry.injectable";
+import kubeconfigSyncLoggerInjectable from "./logger.injectable";
+import watchKubeconfigFileChangesInjectable from "./watch-file-changes.injectable";
+import kubeconfigSyncsInjectable from "../../../common/user-store/kubeconfig-syncs.injectable";
 
 const kubeconfigSyncManagerInjectable = getInjectable({
   id: "kubeconfig-sync-manager",
 
   instantiate: (di) => new KubeconfigSyncManager({
     directoryForKubeConfigs: di.inject(directoryForKubeConfigsInjectable),
-    createCluster: di.inject(createClusterInjectionToken),
-    clusterManager: di.inject(clusterManagerInjectable),
-    entityRegistry: di.inject(catalogEntityRegistryInjectable),
+    logger: di.inject(kubeconfigSyncLoggerInjectable),
+    watchKubeconfigFileChanges: di.inject(watchKubeconfigFileChangesInjectable),
+    kubeconfigSyncs: di.inject(kubeconfigSyncsInjectable),
   }),
 });
 
diff --git a/src/main/catalog-sources/kubeconfig-sync/manager.ts b/src/main/catalog-sources/kubeconfig-sync/manager.ts
index 1d281bc936..305f25a909 100644
--- a/src/main/catalog-sources/kubeconfig-sync/manager.ts
+++ b/src/main/catalog-sources/kubeconfig-sync/manager.ts
@@ -4,97 +4,61 @@
  */
 
 import type { IComputedValue, ObservableMap } from "mobx";
-import { action, observable, computed, runInAction, makeObservable, observe } from "mobx";
+import { action, observable, computed, makeObservable, observe } from "mobx";
 import type { CatalogEntity } from "../../../common/catalog";
-import type { FSWatcher } from "chokidar";
-import { watch } from "chokidar";
-import type { Stats } from "fs";
-import fs from "fs";
-import path from "path";
 import type { Disposer } from "../../../common/utils";
-import { disposer, bytesToUnits, getOrInsertWith, iter, noop } from "../../../common/utils";
-import logger from "../../logger";
-import type { KubeConfig } from "@kubernetes/client-node";
-import { loadConfigFromString, splitConfig } from "../../../common/kube-helpers";
-import type { ClusterManager } from "../../cluster-manager";
-import { catalogEntityFromCluster } from "../../cluster-manager";
-import { UserStore } from "../../../common/user-store";
-import { ClusterStore } from "../../../common/cluster-store/cluster-store";
-import { createHash } from "crypto";
-import { homedir } from "os";
-import globToRegExp from "glob-to-regexp";
-import { inspect } from "util";
-import type { ClusterConfigData, UpdateClusterModel } from "../../../common/cluster-types";
-import type { Cluster } from "../../../common/cluster/cluster";
-import type { CatalogEntityRegistry } from "../../catalog/entity-registry";
-import type { CreateCluster } from "../../../common/cluster/create-cluster-injection-token";
-
-const logPrefix = "[KUBECONFIG-SYNC]:";
-
-/**
- * This is the list of globs of which files are ignored when under a folder sync
- */
-const ignoreGlobs = [
-  "*.lock", // kubectl lock files
-  "*.swp", // vim swap files
-  ".DS_Store", // macOS specific
-].map(rawGlob => ({
-  rawGlob,
-  matcher: globToRegExp(rawGlob),
-}));
-
-/**
- * This should be much larger than any kubeconfig text file
- *
- * Even if you have a cert-file, key-file, and client-cert files that is only
- * 12kb of extra data (at 4096 bytes each) which allows for around 150 entries.
- */
-const folderSyncMaxAllowedFileReadSize = 2 * 1024 * 1024; // 2 MiB
-const fileSyncMaxAllowedFileReadSize = 16 * folderSyncMaxAllowedFileReadSize; // 32 MiB
+import { iter } from "../../../common/utils";
+import type { KubeconfigSyncValue } from "../../../common/user-store";
+import type { Logger } from "../../../common/logger";
+import type { WatchKubeconfigFileChanges } from "./watch-file-changes.injectable";
 
 interface KubeconfigSyncManagerDependencies {
   readonly directoryForKubeConfigs: string;
-  readonly entityRegistry: CatalogEntityRegistry;
-  readonly clusterManager: ClusterManager;
-  createCluster: CreateCluster;
+  readonly logger: Logger;
+  readonly kubeconfigSyncs: ObservableMap<string, KubeconfigSyncValue>;
+  watchKubeconfigFileChanges: WatchKubeconfigFileChanges;
 }
 
-const kubeConfigSyncName = "lens:kube-sync";
-
 export class KubeconfigSyncManager {
   protected readonly sources = observable.map<string, [IComputedValue<CatalogEntity[]>, Disposer]>();
-  protected syncing = false;
   protected syncListDisposer?: Disposer;
 
   constructor(protected readonly dependencies: KubeconfigSyncManagerDependencies) {
     makeObservable(this);
   }
 
+  public readonly source = computed(() => {
+    /**
+     * This prevents multiple overlapping syncs from leading to multiple entities with the same IDs
+     */
+    const seenIds = new Set<string>();
+
+    return (
+      iter.pipeline(this.sources.values())
+        .flatMap(([entities]) => entities.get())
+        .filter(entity => {
+          const alreadySeen = seenIds.has(entity.getId());
+
+          seenIds.add(entity.getId());
+
+          return !alreadySeen;
+        })
+        .collect(items => [...items])
+    );
+  });
+
   @action
   startSync(): void {
-    if (this.syncing) {
-      return;
-    }
-
-    this.syncing = true;
-
-    logger.info(`${logPrefix} starting requested syncs`);
-
-    this.dependencies.entityRegistry.addComputedSource(kubeConfigSyncName, computed(() => (
-      Array.from(iter.flatMap(
-        this.sources.values(),
-        ([entities]) => entities.get(),
-      ))
-    )));
+    this.dependencies.logger.info(`starting requested syncs`);
 
     // This must be done so that c&p-ed clusters are visible
     this.startNewSync(this.dependencies.directoryForKubeConfigs);
 
-    for (const filePath of UserStore.getInstance().syncKubeconfigEntries.keys()) {
+    for (const filePath of this.dependencies.kubeconfigSyncs.keys()) {
       this.startNewSync(filePath);
     }
 
-    this.syncListDisposer = observe(UserStore.getInstance().syncKubeconfigEntries, change => {
+    this.syncListDisposer = observe(this.dependencies.kubeconfigSyncs, change => {
       switch (change.type) {
         case "add":
           this.startNewSync(change.name);
@@ -108,275 +72,38 @@ export class KubeconfigSyncManager {
 
   @action
   stopSync() {
+    this.dependencies.logger.info(`stopping requested syncs`);
     this.syncListDisposer?.();
 
     for (const filePath of this.sources.keys()) {
       this.stopOldSync(filePath);
     }
-
-    this.dependencies.entityRegistry.removeSource(kubeConfigSyncName);
-    this.syncing = false;
   }
 
   @action
   protected startNewSync(filePath: string): void {
     if (this.sources.has(filePath)) {
       // don't start a new sync if we already have one
-      return void logger.debug(`${logPrefix} already syncing file/folder`, { filePath });
+      return this.dependencies.logger.debug(`already syncing file/folder`, { filePath });
     }
 
     this.sources.set(
       filePath,
-      watchFileChanges(filePath, this.dependencies),
+      this.dependencies.watchKubeconfigFileChanges(filePath),
     );
 
-    logger.info(`${logPrefix} starting sync of file/folder`, { filePath });
-    logger.debug(`${logPrefix} ${this.sources.size} files/folders watched`, { files: Array.from(this.sources.keys()) });
+    this.dependencies.logger.info(`starting sync of file/folder`, { filePath });
+    this.dependencies.logger.debug(`${this.sources.size} files/folders watched`, { files: Array.from(this.sources.keys()) });
   }
 
   @action
   protected stopOldSync(filePath: string): void {
     if (!this.sources.delete(filePath)) {
       // already stopped
-      return void logger.debug(`${logPrefix} no syncing file/folder to stop`, { filePath });
+      return this.dependencies.logger.debug(`no syncing file/folder to stop`, { filePath });
     }
 
-    logger.info(`${logPrefix} stopping sync of file/folder`, { filePath });
-    logger.debug(`${logPrefix} ${this.sources.size} files/folders watched`, { files: Array.from(this.sources.keys()) });
+    this.dependencies.logger.info(`stopping sync of file/folder`, { filePath });
+    this.dependencies.logger.debug(`${this.sources.size} files/folders watched`, { files: Array.from(this.sources.keys()) });
   }
 }
-
-// exported for testing
-export function configToModels(rootConfig: KubeConfig, filePath: string): [UpdateClusterModel, ClusterConfigData][] {
-  const validConfigs: ReturnType<typeof configToModels> = [];
-
-  for (const { config, validationResult } of splitConfig(rootConfig)) {
-    if (validationResult.error) {
-      logger.debug(`${logPrefix} context failed validation: ${validationResult.error}`, { context: config.currentContext, filePath });
-    } else {
-      validConfigs.push([
-        {
-          kubeConfigPath: filePath,
-          contextName: config.currentContext,
-        },
-        {
-          clusterServerUrl: validationResult.cluster.server,
-        },
-      ]);
-    }
-  }
-
-  return validConfigs;
-}
-
-type RootSourceValue = [Cluster, CatalogEntity];
-type RootSource = ObservableMap<string, RootSourceValue>;
-
-interface ComputeDiffDependencies {
-  directoryForKubeConfigs: string;
-  createCluster: CreateCluster;
-  clusterManager: ClusterManager;
-}
-
-// exported for testing
-export const computeDiff = ({ directoryForKubeConfigs, createCluster, clusterManager }: ComputeDiffDependencies) => (contents: string, source: RootSource, filePath: string): void => {
-  runInAction(() => {
-    try {
-      const { config, error } = loadConfigFromString(contents);
-
-      if (error) {
-        logger.warn(`${logPrefix} encountered errors while loading config: ${error.message}`, { filePath, details: error.details });
-      }
-
-      const rawModels = configToModels(config, filePath);
-      const models = new Map(rawModels.map(([model, configData]) => [model.contextName, [model, configData] as const]));
-
-      logger.debug(`${logPrefix} File now has ${models.size} entries`, { filePath });
-
-      for (const [contextName, value] of source) {
-        const data = models.get(contextName);
-
-        // remove and disconnect clusters that were removed from the config
-        if (!data) {
-          // remove from the deleting set, so that if a new context of the same name is added, it isn't marked as deleting
-          clusterManager.deleting.delete(value[0].id);
-
-          value[0].disconnect();
-          source.delete(contextName);
-          logger.debug(`${logPrefix} Removed old cluster from sync`, { filePath, contextName });
-          continue;
-        }
-
-        // TODO: For the update check we need to make sure that the config itself hasn't changed.
-        // Probably should make it so that cluster keeps a copy of the config in its memory and
-        // diff against that
-
-        // or update the model and mark it as not needed to be added
-        value[0].updateModel(data[0]);
-        models.delete(contextName);
-        logger.debug(`${logPrefix} Updated old cluster from sync`, { filePath, contextName });
-      }
-
-      for (const [contextName, [model, configData]] of models) {
-        // add new clusters to the source
-        try {
-          const clusterId = createHash("md5").update(`${filePath}:${contextName}`).digest("hex");
-
-          const cluster = ClusterStore.getInstance().getById(clusterId) || createCluster({ ...model, id: clusterId }, configData);
-
-          if (!cluster.apiUrl) {
-            throw new Error("Cluster constructor failed, see above error");
-          }
-
-          const entity = catalogEntityFromCluster(cluster);
-
-          if (!filePath.startsWith(directoryForKubeConfigs)) {
-            entity.metadata.labels.file = filePath.replace(homedir(), "~");
-          }
-          source.set(contextName, [cluster, entity]);
-
-          logger.debug(`${logPrefix} Added new cluster from sync`, { filePath, contextName });
-        } catch (error) {
-          logger.warn(`${logPrefix} Failed to create cluster from model: ${error}`, { filePath, contextName });
-        }
-      }
-    } catch (error) {
-      logger.warn(`${logPrefix} Failed to compute diff: ${error}`, { filePath });
-      source.clear(); // clear source if we have failed so as to not show outdated information
-    }
-  });
-};
-
-interface DiffChangedConfigArgs {
-  filePath: string;
-  source: RootSource;
-  stats: fs.Stats;
-  maxAllowedFileReadSize: number;
-}
-
-const diffChangedConfigFor = (dependencies: ComputeDiffDependencies) => ({ filePath, source, stats, maxAllowedFileReadSize }: DiffChangedConfigArgs): Disposer => {
-  logger.debug(`${logPrefix} file changed`, { filePath });
-
-  if (stats.size >= maxAllowedFileReadSize) {
-    logger.warn(`${logPrefix} skipping ${filePath}: size=${bytesToUnits(stats.size)} is larger than maxSize=${bytesToUnits(maxAllowedFileReadSize)}`);
-    source.clear();
-
-    return noop;
-  }
-
-  const controller = new AbortController();
-  const fileContentsP = fs.promises.readFile(filePath, {
-    signal: controller.signal,
-  });
-  const cleanup = disposer(
-    () => controller.abort(),
-  );
-
-  fileContentsP
-    .then((fileData) => {
-      const decoder = new TextDecoder("utf-8", { fatal: true });
-
-      try {
-        const fileString = decoder.decode(fileData);
-
-        computeDiff(dependencies)(fileString, source, filePath);
-      } catch (error) {
-        logger.warn(`${logPrefix} skipping ${filePath}: ${error}`);
-        source.clear();
-        cleanup();
-      }
-    })
-    .catch(error => {
-      if (controller.signal.aborted) {
-        return;
-      }
-
-      logger.warn(`${logPrefix} failed to read file: ${error}`, { filePath });
-      cleanup();
-    });
-
-  return cleanup;
-};
-
-const watchFileChanges = (filePath: string, dependencies: ComputeDiffDependencies): [IComputedValue<CatalogEntity[]>, Disposer] => {
-  const rootSource = observable.map<string, ObservableMap<string, RootSourceValue>>();
-  const derivedSource = computed(() => Array.from(iter.flatMap(rootSource.values(), from => iter.map(from.values(), child => child[1]))));
-
-  let watcher: FSWatcher;
-
-  (async () => {
-    try {
-      const stat = await fs.promises.stat(filePath);
-      const isFolderSync = stat.isDirectory();
-      const cleanupFns = new Map<string, Disposer>();
-      const maxAllowedFileReadSize = isFolderSync
-        ? folderSyncMaxAllowedFileReadSize
-        : fileSyncMaxAllowedFileReadSize;
-
-      watcher = watch(filePath, {
-        followSymlinks: true,
-        depth: isFolderSync ? 0 : 1, // DIRs works with 0 but files need 1 (bug: https://github.com/paulmillr/chokidar/issues/1095)
-        disableGlobbing: true,
-        ignorePermissionErrors: true,
-        usePolling: false,
-        awaitWriteFinish: {
-          pollInterval: 100,
-          stabilityThreshold: 1000,
-        },
-        atomic: 150, // for "atomic writes"
-        alwaysStat: true,
-      });
-
-      const diffChangedConfig = diffChangedConfigFor(dependencies);
-
-      watcher
-        .on("change", (childFilePath, stats: Stats): void => {
-          const cleanup = cleanupFns.get(childFilePath);
-
-          if (!cleanup) {
-            // file was previously ignored, do nothing
-            return void logger.debug(`${logPrefix} ${inspect(childFilePath)} that should have been previously ignored has changed. Doing nothing`);
-          }
-
-          cleanup();
-          cleanupFns.set(childFilePath, diffChangedConfig({
-            filePath: childFilePath,
-            source: getOrInsertWith(rootSource, childFilePath, observable.map),
-            stats,
-            maxAllowedFileReadSize,
-          }));
-        })
-        .on("add", (childFilePath, stats: Stats): void => {
-          if (isFolderSync) {
-            const fileName = path.basename(childFilePath);
-
-            for (const ignoreGlob of ignoreGlobs) {
-              if (ignoreGlob.matcher.test(fileName)) {
-                return void logger.info(`${logPrefix} ignoring ${inspect(childFilePath)} due to ignore glob: ${ignoreGlob.rawGlob}`);
-              }
-            }
-          }
-
-          cleanupFns.set(childFilePath, diffChangedConfig({
-            filePath: childFilePath,
-            source: getOrInsertWith(rootSource, childFilePath, observable.map),
-            stats,
-            maxAllowedFileReadSize,
-          }));
-        })
-        .on("unlink", (childFilePath) => {
-          cleanupFns.get(childFilePath)?.();
-          cleanupFns.delete(childFilePath);
-          rootSource.delete(childFilePath);
-        })
-        .on("error", error => logger.error(`${logPrefix} watching file/folder failed: ${error}`, { filePath }));
-    } catch (error) {
-      console.log((error as { stack: unknown }).stack);
-      logger.warn(`${logPrefix} failed to start watching changes: ${error}`);
-    }
-  })();
-
-  return [derivedSource, () => {
-    watcher?.close();
-  }];
-};
diff --git a/src/main/catalog-sources/kubeconfig-sync/watch-file-changes.injectable.ts b/src/main/catalog-sources/kubeconfig-sync/watch-file-changes.injectable.ts
new file mode 100644
index 0000000000..c843222a5f
--- /dev/null
+++ b/src/main/catalog-sources/kubeconfig-sync/watch-file-changes.injectable.ts
@@ -0,0 +1,134 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import GlobToRegExp from "glob-to-regexp";
+import type { IComputedValue, ObservableMap } from "mobx";
+import { computed, observable } from "mobx";
+import path from "path";
+import { inspect } from "util";
+import type { CatalogEntity } from "../../../common/catalog";
+import type { Cluster } from "../../../common/cluster/cluster";
+import statInjectable from "../../../common/fs/stat/stat.injectable";
+import type { Watcher } from "../../../common/fs/watch/watch.injectable";
+import watchInjectable from "../../../common/fs/watch/watch.injectable";
+import type { Disposer } from "../../../common/utils";
+import { getOrInsertWith, iter } from "../../../common/utils";
+import diffChangedKubeconfigInjectable from "./diff-changed-kubeconfig.injectable";
+import kubeconfigSyncLoggerInjectable from "./logger.injectable";
+
+export type WatchKubeconfigFileChanges = (filepath: string) => [IComputedValue<CatalogEntity[]>, Disposer];
+
+/**
+ * This is the list of globs of which files are ignored when under a folder sync
+ */
+const ignoreGlobs = [
+  "*.lock", // kubectl lock files
+  "*.swp", // vim swap files
+  ".DS_Store", // macOS specific
+].map(rawGlob => ({
+  rawGlob,
+  matcher: GlobToRegExp(rawGlob),
+}));
+
+/**
+ * This should be much larger than any kubeconfig text file
+ *
+ * Even if you have a cert-file, key-file, and client-cert files that is only
+ * 12kb of extra data (at 4096 bytes each) which allows for around 150 entries.
+ */
+const folderSyncMaxAllowedFileReadSize = 2 * 1024 * 1024; // 2 MiB
+const fileSyncMaxAllowedFileReadSize = 16 * folderSyncMaxAllowedFileReadSize; // 32 MiB
+
+const watchKubeconfigFileChangesInjectable = getInjectable({
+  id: "watch-kubeconfig-file-changes",
+  instantiate: (di): WatchKubeconfigFileChanges => {
+    const diffChangedKubeconfig = di.inject(diffChangedKubeconfigInjectable);
+    const logger = di.inject(kubeconfigSyncLoggerInjectable);
+    const stat = di.inject(statInjectable);
+    const watch = di.inject(watchInjectable);
+
+    return (filePath) => {
+      const rootSource = observable.map<string, ObservableMap<string, [Cluster, CatalogEntity]>>();
+      const derivedSource = computed(() => Array.from(iter.flatMap(rootSource.values(), from => iter.map(from.values(), child => child[1]))));
+
+      let watcher: Watcher<true>;
+
+      (async () => {
+        try {
+          const stats = await stat(filePath);
+          const isFolderSync = stats.isDirectory();
+          const cleanupFns = new Map<string, Disposer>();
+          const maxAllowedFileReadSize = isFolderSync
+            ? folderSyncMaxAllowedFileReadSize
+            : fileSyncMaxAllowedFileReadSize;
+
+          watcher = watch<true>(filePath, {
+            followSymlinks: true,
+            depth: isFolderSync ? 0 : 1, // DIRs works with 0 but files need 1 (bug: https://github.com/paulmillr/chokidar/issues/1095)
+            disableGlobbing: true,
+            ignorePermissionErrors: true,
+            usePolling: false,
+            awaitWriteFinish: {
+              pollInterval: 100,
+              stabilityThreshold: 1000,
+            },
+            atomic: 150, // for "atomic writes"
+            alwaysStat: true,
+          });
+
+          watcher
+            .on("change", (childFilePath, stats): void => {
+              const cleanup = cleanupFns.get(childFilePath);
+
+              if (!cleanup) {
+                // file was previously ignored, do nothing
+                return void logger.debug(`${inspect(childFilePath)} that should have been previously ignored has changed. Doing nothing`);
+              }
+
+              cleanup();
+              cleanupFns.set(childFilePath, diffChangedKubeconfig({
+                filePath: childFilePath,
+                source: getOrInsertWith(rootSource, childFilePath, observable.map),
+                stats,
+                maxAllowedFileReadSize,
+              }));
+            })
+            .on("add", (childFilePath, stats): void => {
+              if (isFolderSync) {
+                const fileName = path.basename(childFilePath);
+
+                for (const ignoreGlob of ignoreGlobs) {
+                  if (ignoreGlob.matcher.test(fileName)) {
+                    return void logger.info(`ignoring ${inspect(childFilePath)} due to ignore glob: ${ignoreGlob.rawGlob}`);
+                  }
+                }
+              }
+
+              cleanupFns.set(childFilePath, diffChangedKubeconfig({
+                filePath: childFilePath,
+                source: getOrInsertWith(rootSource, childFilePath, observable.map),
+                stats,
+                maxAllowedFileReadSize,
+              }));
+            })
+            .on("unlink", (childFilePath) => {
+              cleanupFns.get(childFilePath)?.();
+              cleanupFns.delete(childFilePath);
+              rootSource.delete(childFilePath);
+            })
+            .on("error", error => logger.error(`watching file/folder failed: ${error}`, { filePath }));
+        } catch (error) {
+          logger.warn(`failed to start watching changes: ${error}`);
+        }
+      })();
+
+      return [derivedSource, () => {
+        watcher?.close();
+      }];
+    };
+  },
+});
+
+export default watchKubeconfigFileChangesInjectable;
diff --git a/src/main/catalog-sync-to-renderer/catalog-sync-to-renderer.injectable.ts b/src/main/catalog-sync-to-renderer/catalog-sync-to-renderer.injectable.ts
index 7e588481a8..a9ba676bf9 100644
--- a/src/main/catalog-sync-to-renderer/catalog-sync-to-renderer.injectable.ts
+++ b/src/main/catalog-sync-to-renderer/catalog-sync-to-renderer.injectable.ts
@@ -13,8 +13,9 @@ const catalogSyncToRendererInjectable = getInjectable({
   instantiate: (di) => {
     const catalogEntityRegistry = di.inject(catalogEntityRegistryInjectable);
 
-    return getStartableStoppable("catalog-sync", () =>
-      startCatalogSyncToRenderer(catalogEntityRegistry),
+    return getStartableStoppable(
+      "catalog-sync",
+      () => startCatalogSyncToRenderer(catalogEntityRegistry),
     );
   },
 
diff --git a/src/main/catalog-sync-to-renderer/start-catalog-sync.injectable.ts b/src/main/catalog-sync-to-renderer/start-catalog-sync.injectable.ts
index 3dfd9ee2ae..ce06a44281 100644
--- a/src/main/catalog-sync-to-renderer/start-catalog-sync.injectable.ts
+++ b/src/main/catalog-sync-to-renderer/start-catalog-sync.injectable.ts
@@ -13,6 +13,7 @@ const startCatalogSyncInjectable = getInjectable({
     const catalogSyncToRenderer = di.inject(catalogSyncToRendererInjectable);
 
     return {
+      id: "start-catalog-sync",
       run: async () => {
         if (!catalogSyncToRenderer.started) {
           await catalogSyncToRenderer.start();
diff --git a/src/main/catalog-sync-to-renderer/stop-catalog-sync.injectable.ts b/src/main/catalog-sync-to-renderer/stop-catalog-sync.injectable.ts
index 71c5be55f1..353790d8b2 100644
--- a/src/main/catalog-sync-to-renderer/stop-catalog-sync.injectable.ts
+++ b/src/main/catalog-sync-to-renderer/stop-catalog-sync.injectable.ts
@@ -13,10 +13,13 @@ const stopCatalogSyncInjectable = getInjectable({
     const catalogSyncToRenderer = di.inject(catalogSyncToRendererInjectable);
 
     return {
-      run: async () => {
+      id: "stop-catalog-sync",
+      run: () => {
         if (catalogSyncToRenderer.started) {
-          await catalogSyncToRenderer.stop();
+          catalogSyncToRenderer.stop();
         }
+
+        return undefined;
       },
     };
   },
diff --git a/src/main/cluster-manager.injectable.ts b/src/main/cluster-manager.injectable.ts
deleted file mode 100644
index 2b55f0e854..0000000000
--- a/src/main/cluster-manager.injectable.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { ClusterManager } from "./cluster-manager";
-import clusterStoreInjectable from "../common/cluster-store/cluster-store.injectable";
-import catalogEntityRegistryInjectable from "./catalog/entity-registry.injectable";
-
-const clusterManagerInjectable = getInjectable({
-  id: "cluster-manager",
-
-  instantiate: (di) => {
-    const clusterManager = new ClusterManager({
-      store: di.inject(clusterStoreInjectable),
-      catalogEntityRegistry: di.inject(catalogEntityRegistryInjectable),
-    });
-
-    clusterManager.init();
-
-    return clusterManager;
-  },
-});
-
-export default clusterManagerInjectable;
diff --git a/src/main/cluster/are-being-deleted.injectable.ts b/src/main/cluster/are-being-deleted.injectable.ts
new file mode 100644
index 0000000000..610791aee7
--- /dev/null
+++ b/src/main/cluster/are-being-deleted.injectable.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { observable } from "mobx";
+import type { ClusterId } from "../../common/cluster-types";
+
+const clustersThatAreBeingDeletedInjectable = getInjectable({
+  id: "clusters-that-are-being-deleted",
+  instantiate: () => observable.set<ClusterId>(),
+});
+
+export default clustersThatAreBeingDeletedInjectable;
diff --git a/src/main/cluster/initialize-manager.injectable.ts b/src/main/cluster/initialize-manager.injectable.ts
new file mode 100644
index 0000000000..adabcf416c
--- /dev/null
+++ b/src/main/cluster/initialize-manager.injectable.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { onLoadOfApplicationInjectionToken } from "../start-main-application/runnable-tokens/on-load-of-application-injection-token";
+import clusterManagerInjectable from "./manager.injectable";
+
+const initializeClusterManagerInjectable = getInjectable({
+  id: "initialize-cluster-manager",
+  instantiate: (di) => {
+    const clusterManager = di.inject(clusterManagerInjectable);
+
+    return {
+      id: "initialize-cluster-manager",
+      run: () => {
+        clusterManager.init();
+      },
+    };
+  },
+  injectionToken: onLoadOfApplicationInjectionToken,
+  causesSideEffects: true,
+});
+
+export default initializeClusterManagerInjectable;
diff --git a/src/main/cluster/manager.injectable.ts b/src/main/cluster/manager.injectable.ts
new file mode 100644
index 0000000000..e4c22f0e38
--- /dev/null
+++ b/src/main/cluster/manager.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import clusterStoreInjectable from "../../common/cluster-store/cluster-store.injectable";
+import catalogEntityRegistryInjectable from "../catalog/entity-registry.injectable";
+import clustersThatAreBeingDeletedInjectable from "./are-being-deleted.injectable";
+import { ClusterManager } from "./manager";
+import visibleClusterInjectable from "./visible-cluster.injectable";
+
+const clusterManagerInjectable = getInjectable({
+  id: "cluster-manager",
+
+  instantiate: (di) => new ClusterManager({
+    store: di.inject(clusterStoreInjectable),
+    catalogEntityRegistry: di.inject(catalogEntityRegistryInjectable),
+    clustersThatAreBeingDeleted: di.inject(clustersThatAreBeingDeletedInjectable),
+    visibleCluster: di.inject(visibleClusterInjectable),
+  }),
+});
+
+export default clusterManagerInjectable;
diff --git a/src/main/cluster-manager.ts b/src/main/cluster/manager.ts
similarity index 87%
rename from src/main/cluster-manager.ts
rename to src/main/cluster/manager.ts
index 787f2a1618..d5c06c0619 100644
--- a/src/main/cluster-manager.ts
+++ b/src/main/cluster/manager.ts
@@ -3,36 +3,35 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import "../common/ipc/cluster";
+import "../../common/ipc/cluster";
 import type http from "http";
-import { action, makeObservable, observable, observe, reaction, toJS } from "mobx";
-import type { Cluster } from "../common/cluster/cluster";
-import logger from "./logger";
-import { apiKubePrefix } from "../common/vars";
-import { getClusterIdFromHost, isErrnoException } from "../common/utils";
-import type { KubernetesClusterPrometheusMetrics } from "../common/catalog-entities/kubernetes-cluster";
-import { isKubernetesCluster, KubernetesCluster, LensKubernetesClusterStatus } from "../common/catalog-entities/kubernetes-cluster";
-import { ipcMainOn } from "../common/ipc";
+import type { IObservableValue, ObservableSet } from "mobx";
+import { action, makeObservable, observe, reaction, toJS } from "mobx";
+import type { Cluster } from "../../common/cluster/cluster";
+import logger from "../logger";
+import { apiKubePrefix } from "../../common/vars";
+import { getClusterIdFromHost, isErrnoException } from "../../common/utils";
+import type { KubernetesClusterPrometheusMetrics } from "../../common/catalog-entities/kubernetes-cluster";
+import { isKubernetesCluster, KubernetesCluster, LensKubernetesClusterStatus } from "../../common/catalog-entities/kubernetes-cluster";
+import { ipcMainOn } from "../../common/ipc";
 import { once } from "lodash";
-import type { ClusterStore } from "../common/cluster-store/cluster-store";
-import type { ClusterId } from "../common/cluster-types";
-import type { CatalogEntityRegistry } from "./catalog";
+import type { ClusterStore } from "../../common/cluster-store/cluster-store";
+import type { ClusterId } from "../../common/cluster-types";
+import type { CatalogEntityRegistry } from "../catalog";
 
 const logPrefix = "[CLUSTER-MANAGER]:";
 
 const lensSpecificClusterStatuses: Set<string> = new Set(Object.values(LensKubernetesClusterStatus));
 
 interface Dependencies {
-  store: ClusterStore;
-  catalogEntityRegistry: CatalogEntityRegistry;
+  readonly store: ClusterStore;
+  readonly catalogEntityRegistry: CatalogEntityRegistry;
+  readonly clustersThatAreBeingDeleted: ObservableSet<ClusterId>;
+  readonly visibleCluster: IObservableValue<ClusterId | null>;
 }
 
 export class ClusterManager {
-  deleting = observable.set<ClusterId>();
-
-  @observable visibleCluster: ClusterId | undefined = undefined;
-
-  constructor(private dependencies: Dependencies) {
+  constructor(private readonly dependencies: Dependencies) {
     makeObservable(this);
   }
 
@@ -58,7 +57,7 @@ export class ClusterManager {
 
     reaction(() => [
       this.dependencies.catalogEntityRegistry.filterItemsByPredicate(isKubernetesCluster),
-      this.visibleCluster,
+      this.dependencies.visibleCluster.get(),
     ] as const, ([entities, visibleCluster]) => {
       for (const entity of entities) {
         if (entity.getId() === visibleCluster) {
@@ -69,7 +68,7 @@ export class ClusterManager {
       }
     });
 
-    observe(this.deleting, change => {
+    observe(this.dependencies.clustersThatAreBeingDeleted, change => {
       if (change.type === "add") {
         this.updateEntityStatus(this.dependencies.catalogEntityRegistry.findById(change.newValue) as KubernetesCluster);
       }
@@ -141,7 +140,7 @@ export class ClusterManager {
 
   @action
   protected updateEntityStatus(entity: KubernetesCluster, cluster?: Cluster) {
-    if (this.deleting.has(entity.getId())) {
+    if (this.dependencies.clustersThatAreBeingDeleted.has(entity.getId())) {
       entity.status.phase = LensKubernetesClusterStatus.DELETING;
       entity.status.enabled = false;
     } else {
diff --git a/src/main/cluster/visibility-handler.injectable.ts b/src/main/cluster/visibility-handler.injectable.ts
new file mode 100644
index 0000000000..31f6ff13ec
--- /dev/null
+++ b/src/main/cluster/visibility-handler.injectable.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { clusterVisibilityChannel } from "../../common/cluster/visibility-channel";
+import { getMessageChannelListenerInjectable } from "../../common/utils/channel/message-channel-listener-injection-token";
+import visibleClusterInjectable from "./visible-cluster.injectable";
+
+const clusterVisibilityHandlerInjectable = getMessageChannelListenerInjectable({
+  channel: clusterVisibilityChannel,
+  id: "base",
+  handler: (di) => {
+    const visibleCluster = di.inject(visibleClusterInjectable);
+
+    return (clusterId) => visibleCluster.set(clusterId);
+  },
+});
+
+export default clusterVisibilityHandlerInjectable;
diff --git a/src/main/cluster/visible-cluster.injectable.ts b/src/main/cluster/visible-cluster.injectable.ts
new file mode 100644
index 0000000000..2d5817b20c
--- /dev/null
+++ b/src/main/cluster/visible-cluster.injectable.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { observable } from "mobx";
+import type { ClusterId } from "../../common/cluster-types";
+
+const visibleClusterInjectable = getInjectable({
+  id: "visible-cluster",
+  instantiate: () => observable.box<ClusterId | null>(null),
+});
+
+export default visibleClusterInjectable;
diff --git a/src/main/context-handler/context-handler.ts b/src/main/context-handler/context-handler.ts
index 7671754cc2..7d40bfcd00 100644
--- a/src/main/context-handler/context-handler.ts
+++ b/src/main/context-handler/context-handler.ts
@@ -3,16 +3,18 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { PrometheusProvider, PrometheusService, PrometheusProviderRegistry } from "../prometheus/provider-registry";
+import type { PrometheusProvider, PrometheusService } from "../prometheus/provider";
 import type { ClusterPrometheusPreferences } from "../../common/cluster-types";
 import type { Cluster } from "../../common/cluster/cluster";
 import type httpProxy from "http-proxy";
 import type { UrlWithStringQuery } from "url";
 import url from "url";
 import { CoreV1Api } from "@kubernetes/client-node";
-import logger from "../logger";
 import type { KubeAuthProxy } from "../kube-auth-proxy/kube-auth-proxy";
 import type { CreateKubeAuthProxy } from "../kube-auth-proxy/create-kube-auth-proxy.injectable";
+import type { GetPrometheusProviderByKind } from "../prometheus/get-by-kind.injectable";
+import type { IComputedValue } from "mobx";
+import type { Logger } from "../../common/logger";
 
 export interface PrometheusDetails {
   prometheusPath: string;
@@ -26,10 +28,12 @@ interface PrometheusServicePreferences {
   prefix: string;
 }
 
-interface Dependencies {
-  readonly createKubeAuthProxy: CreateKubeAuthProxy;
+export interface ContextHandlerDependencies {
+  createKubeAuthProxy: CreateKubeAuthProxy;
+  getPrometheusProviderByKind: GetPrometheusProviderByKind;
   readonly authProxyCa: string;
-  readonly prometheusProviderRegistry: PrometheusProviderRegistry;
+  readonly prometheusProviders: IComputedValue<PrometheusProvider[]>;
+  readonly logger: Logger;
 }
 
 export interface ClusterContextHandler {
@@ -51,7 +55,7 @@ export class ContextHandler implements ClusterContextHandler {
   protected prometheusProvider?: string;
   protected prometheus?: PrometheusServicePreferences;
 
-  constructor(private dependencies: Dependencies, protected cluster: Cluster) {
+  constructor(private readonly dependencies: ContextHandlerDependencies, protected readonly cluster: Cluster) {
     this.clusterUrl = url.parse(cluster.apiUrl);
     this.setupPrometheus(cluster.preferences);
   }
@@ -75,28 +79,29 @@ export class ContextHandler implements ClusterContextHandler {
 
   protected ensurePrometheusProvider(service: PrometheusService): PrometheusProvider {
     if (!this.prometheusProvider) {
-      logger.info(`[CONTEXT-HANDLER]: using ${service.id} as prometheus provider for clusterId=${this.cluster.id}`);
-      this.prometheusProvider = service.id;
+      this.dependencies.logger.info(`[CONTEXT-HANDLER]: using ${service.kind} as prometheus provider for clusterId=${this.cluster.id}`);
+      this.prometheusProvider = service.kind;
     }
 
-    return this.dependencies.prometheusProviderRegistry.getByKind(this.prometheusProvider);
+    return this.dependencies.getPrometheusProviderByKind(this.prometheusProvider);
   }
 
   protected listPotentialProviders(): PrometheusProvider[] {
-    const registry = this.dependencies.prometheusProviderRegistry;
-    const provider = this.prometheusProvider && registry.getByKind(this.prometheusProvider);
+    const provider = this.prometheusProvider && this.dependencies.getPrometheusProviderByKind(this.prometheusProvider);
 
     if (provider) {
       return [provider];
     }
 
-    return Array.from(registry.providers.values());
+    return this.dependencies.prometheusProviders.get();
   }
 
   protected async getPrometheusService(): Promise<PrometheusService> {
+    this.setupPrometheus(this.cluster.preferences);
+
     if (this.prometheus && this.prometheusProvider) {
       return {
-        id: this.prometheusProvider,
+        kind: this.prometheusProvider,
         namespace: this.prometheus.namespace,
         service: this.prometheus.service,
         port: this.prometheus.port,
@@ -109,14 +114,12 @@ export class ContextHandler implements ClusterContextHandler {
     const potentialServices = await Promise.allSettled(
       providers.map(provider => provider.getPrometheusService(apiClient)),
     );
-    const errors: any[] = [];
+    const errors = [];
 
     for (const res of potentialServices) {
       switch (res.status) {
         case "rejected":
-          if (res.reason) {
-            errors.push(String(res.reason));
-          }
+          errors.push(res.reason);
           break;
 
         case "fulfilled":
@@ -126,7 +129,7 @@ export class ContextHandler implements ClusterContextHandler {
       }
     }
 
-    throw Object.assign(new Error("No Prometheus service found"), { cause: errors });
+    throw new Error("No Prometheus service found", { cause: errors });
   }
 
   async resolveAuthProxyUrl(): Promise<string> {
diff --git a/src/main/context-handler/create-context-handler.injectable.ts b/src/main/context-handler/create-context-handler.injectable.ts
index 8185bd7c80..1567721ac4 100644
--- a/src/main/context-handler/create-context-handler.injectable.ts
+++ b/src/main/context-handler/create-context-handler.injectable.ts
@@ -3,32 +3,34 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import selfsigned from "selfsigned";
 import type { Cluster } from "../../common/cluster/cluster";
-import type { ClusterContextHandler } from "./context-handler";
+import type { ClusterContextHandler, ContextHandlerDependencies } from "./context-handler";
 import { ContextHandler } from "./context-handler";
 import createKubeAuthProxyInjectable from "../kube-auth-proxy/create-kube-auth-proxy.injectable";
-import { getKubeAuthProxyCertificate } from "../kube-auth-proxy/get-kube-auth-proxy-certificate";
+import kubeAuthProxyCertificateInjectable from "../kube-auth-proxy/kube-auth-proxy-certificate.injectable";
 import URLParse from "url-parse";
-import prometheusProviderRegistryInjectable from "../prometheus/prometheus-provider-registry.injectable";
+import getPrometheusProviderByKindInjectable from "../prometheus/get-by-kind.injectable";
+import prometheusProvidersInjectable from "../prometheus/providers.injectable";
+import loggerInjectable from "../../common/logger.injectable";
 
 const createContextHandlerInjectable = getInjectable({
   id: "create-context-handler",
 
   instantiate: (di) => {
-    const createKubeAuthProxy = di.inject(createKubeAuthProxyInjectable);
-    const prometheusProviderRegistry = di.inject(prometheusProviderRegistryInjectable);
+    const dependencies: Omit<ContextHandlerDependencies, "authProxyCa"> = {
+      createKubeAuthProxy: di.inject(createKubeAuthProxyInjectable),
+      getPrometheusProviderByKind: di.inject(getPrometheusProviderByKindInjectable),
+      prometheusProviders: di.inject(prometheusProvidersInjectable),
+      logger: di.inject(loggerInjectable),
+    };
 
     return (cluster: Cluster): ClusterContextHandler => {
       const clusterUrl = new URLParse(cluster.apiUrl);
 
-      const dependencies = {
-        createKubeAuthProxy,
-        prometheusProviderRegistry,
-        authProxyCa: getKubeAuthProxyCertificate(clusterUrl.hostname, selfsigned.generate).cert,
-      };
-
-      return new ContextHandler(dependencies, cluster);
+      return new ContextHandler({
+        ...dependencies,
+        authProxyCa: di.inject(kubeAuthProxyCertificateInjectable, clusterUrl.hostname).cert,
+      }, cluster);
     };
   },
 });
diff --git a/src/main/create-cluster/create-cluster.injectable.ts b/src/main/create-cluster/create-cluster.injectable.ts
index d8bf4209f0..e1782ec6c9 100644
--- a/src/main/create-cluster/create-cluster.injectable.ts
+++ b/src/main/create-cluster/create-cluster.injectable.ts
@@ -11,11 +11,14 @@ import createKubectlInjectable from "../kubectl/create-kubectl.injectable";
 import createContextHandlerInjectable from "../context-handler/create-context-handler.injectable";
 import { createClusterInjectionToken } from "../../common/cluster/create-cluster-injection-token";
 import authorizationReviewInjectable from "../../common/cluster/authorization-review.injectable";
+import createAuthorizationNamespaceReview from "../../common/cluster/authorization-namespace-review.injectable";
 import listNamespacesInjectable from "../../common/cluster/list-namespaces.injectable";
+import createListApiResourcesInjectable from "../../common/cluster/list-api-resources.injectable";
 import loggerInjectable from "../../common/logger.injectable";
 import detectorRegistryInjectable from "../cluster-detectors/detector-registry.injectable";
 import createVersionDetectorInjectable from "../cluster-detectors/create-version-detector.injectable";
 import broadcastMessageInjectable from "../../common/ipc/broadcast-message.injectable";
+import loadConfigfromFileInjectable from "../../common/kube-helpers/load-config-from-file.injectable";
 
 const createClusterInjectable = getInjectable({
   id: "create-cluster",
@@ -27,11 +30,14 @@ const createClusterInjectable = getInjectable({
       createKubectl: di.inject(createKubectlInjectable),
       createContextHandler: di.inject(createContextHandlerInjectable),
       createAuthorizationReview: di.inject(authorizationReviewInjectable),
+      createAuthorizationNamespaceReview: di.inject(createAuthorizationNamespaceReview),
+      createListApiResources: di.inject(createListApiResourcesInjectable),
       createListNamespaces: di.inject(listNamespacesInjectable),
       logger: di.inject(loggerInjectable),
       detectorRegistry: di.inject(detectorRegistryInjectable),
       createVersionDetector: di.inject(createVersionDetectorInjectable),
       broadcastMessage: di.inject(broadcastMessageInjectable),
+      loadConfigfromFile: di.inject(loadConfigfromFileInjectable),
     };
 
     return (model, configData) => new Cluster(dependencies, model, configData);
diff --git a/src/main/crypto/random-uuid.global-override-for-injectable.ts b/src/main/crypto/random-uuid.global-override-for-injectable.ts
new file mode 100644
index 0000000000..63e5364a8a
--- /dev/null
+++ b/src/main/crypto/random-uuid.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../../common/test-utils/get-global-override";
+import randomUUIDInjectable from "./random-uuid.injectable";
+
+export default getGlobalOverride(randomUUIDInjectable, () => () => {
+  throw new Error("Tried to get a randomUUID without override");
+});
diff --git a/src/main/crypto/random-uuid.injectable.ts b/src/main/crypto/random-uuid.injectable.ts
new file mode 100644
index 0000000000..cecee487e2
--- /dev/null
+++ b/src/main/crypto/random-uuid.injectable.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { randomUUID } from "crypto";
+
+const randomUUIDInjectable = getInjectable({
+  id: "random-uuid",
+  instantiate: () => randomUUID,
+  causesSideEffects: true,
+});
+
+export default randomUUIDInjectable;
diff --git a/src/main/electron-app/electron-app.global-override-for-injectable.ts b/src/main/electron-app/electron-app.global-override-for-injectable.ts
new file mode 100644
index 0000000000..eeaa1765b7
--- /dev/null
+++ b/src/main/electron-app/electron-app.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../../common/test-utils/get-global-override";
+import electronAppInjectable from "./electron-app.injectable";
+
+export default getGlobalOverride(electronAppInjectable, () => ({
+  getVersion: () => "6.0.0",
+} as Electron.App));
diff --git a/src/main/electron-app/features/sync-theme-from-operating-system.injectable.ts b/src/main/electron-app/features/sync-theme-from-operating-system.injectable.ts
index fa2f8e335e..818bf938ec 100644
--- a/src/main/electron-app/features/sync-theme-from-operating-system.injectable.ts
+++ b/src/main/electron-app/features/sync-theme-from-operating-system.injectable.ts
@@ -18,9 +18,7 @@ const syncThemeFromOperatingSystemInjectable = getInjectable({
 
     return getStartableStoppable("sync-theme-from-operating-system", () => {
       const updateThemeState = () => {
-        const newTheme = getElectronTheme();
-
-        currentThemeState.set(newTheme);
+        currentThemeState.set(getElectronTheme());
       };
 
       nativeTheme.on("updated", updateThemeState);
diff --git a/src/main/electron-app/runnables/clean-up-deep-linking.injectable.ts b/src/main/electron-app/runnables/clean-up-deep-linking.injectable.ts
index 5925197db3..b5088a667a 100644
--- a/src/main/electron-app/runnables/clean-up-deep-linking.injectable.ts
+++ b/src/main/electron-app/runnables/clean-up-deep-linking.injectable.ts
@@ -13,9 +13,8 @@ const cleanUpDeepLinkingInjectable = getInjectable({
     const lensProtocolRouterMain = di.inject(lensProtocolRouterMainInjectable);
 
     return {
-      run: () => {
-        lensProtocolRouterMain.cleanup();
-      },
+      id: "clean-up-deep-linking",
+      run: () => void lensProtocolRouterMain.cleanup(),
     };
   },
 
diff --git a/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts b/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts
index 315b2a5689..5586c93586 100644
--- a/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts
+++ b/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts
@@ -16,12 +16,15 @@ const hideDockForLastClosedWindowInjectable = getInjectable({
     const getVisibleWindows = di.inject(getVisibleWindowsInjectable);
 
     return {
+      id: "hide-dock-when-there-are-no-windows",
       run: () => {
         const visibleWindows = getVisibleWindows();
 
         if (isEmpty(visibleWindows)) {
           app.dock?.hide();
         }
+
+        return undefined;
       },
     };
   },
diff --git a/src/main/electron-app/runnables/dock-visibility/show-dock-for-first-opened-window.injectable.ts b/src/main/electron-app/runnables/dock-visibility/show-dock-for-first-opened-window.injectable.ts
index 1dbafb60f5..b47e511c14 100644
--- a/src/main/electron-app/runnables/dock-visibility/show-dock-for-first-opened-window.injectable.ts
+++ b/src/main/electron-app/runnables/dock-visibility/show-dock-for-first-opened-window.injectable.ts
@@ -13,6 +13,7 @@ const showDockForFirstOpenedWindowInjectable = getInjectable({
     const app = di.inject(electronAppInjectable);
 
     return {
+      id: "show-dock-for-first-opened-window",
       run: () => {
         app.dock?.show();
       },
diff --git a/src/main/electron-app/runnables/enforce-single-application-instance.injectable.ts b/src/main/electron-app/runnables/enforce-single-application-instance.injectable.ts
index 6908b6ac47..f69036ffed 100644
--- a/src/main/electron-app/runnables/enforce-single-application-instance.injectable.ts
+++ b/src/main/electron-app/runnables/enforce-single-application-instance.injectable.ts
@@ -15,10 +15,13 @@ const enforceSingleApplicationInstanceInjectable = getInjectable({
     const exitApp = di.inject(exitAppInjectable);
 
     return {
+      id: "enforce-single-application-instance",
       run: () => {
         if (!requestSingleInstanceLock()) {
           exitApp();
         }
+
+        return undefined;
       },
     };
   },
diff --git a/src/main/electron-app/runnables/setup-application-name.injectable.ts b/src/main/electron-app/runnables/setup-application-name.injectable.ts
index a5f85301c0..fd47480f09 100644
--- a/src/main/electron-app/runnables/setup-application-name.injectable.ts
+++ b/src/main/electron-app/runnables/setup-application-name.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import appNameInjectable from "../../app-paths/app-name/app-name.injectable";
+import appNameInjectable from "../../../common/vars/app-name.injectable";
 import { beforeElectronIsReadyInjectionToken } from "../../start-main-application/runnable-tokens/before-electron-is-ready-injection-token";
 import electronAppInjectable from "../electron-app.injectable";
 
@@ -15,8 +15,11 @@ const setupApplicationNameInjectable = getInjectable({
     const appName = di.inject(appNameInjectable);
 
     return {
+      id: "setup-application-name",
       run: () => {
         app.setName(appName);
+
+        return undefined;
       },
     };
   },
diff --git a/src/main/electron-app/runnables/setup-deep-linking.injectable.ts b/src/main/electron-app/runnables/setup-deep-linking.injectable.ts
index 47087cd1c1..5f82d60f42 100644
--- a/src/main/electron-app/runnables/setup-deep-linking.injectable.ts
+++ b/src/main/electron-app/runnables/setup-deep-linking.injectable.ts
@@ -26,6 +26,7 @@ const setupDeepLinkingInjectable = getInjectable({
     );
 
     return {
+      id: "setup-deep-linking",
       run: async () => {
         logger.info(`📟 Setting protocol client for lens://`);
 
diff --git a/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts b/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts
index 3438bc1428..07807a7965 100644
--- a/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts
+++ b/src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts
@@ -13,6 +13,7 @@ const setupDeveloperToolsInDevelopmentEnvironmentInjectable = getInjectable({
     const logger = di.inject(loggerInjectable);
 
     return {
+      id: "setup-developer-tools-in-development-environment",
       run: () => {
         if (process.env.NODE_ENV !== "development") {
           return;
diff --git a/src/main/electron-app/runnables/setup-device-shutdown.injectable.ts b/src/main/electron-app/runnables/setup-device-shutdown.injectable.ts
index b0b1ee8096..8c3c21ae30 100644
--- a/src/main/electron-app/runnables/setup-device-shutdown.injectable.ts
+++ b/src/main/electron-app/runnables/setup-device-shutdown.injectable.ts
@@ -15,6 +15,7 @@ const setupDeviceShutdownInjectable = getInjectable({
     const exitApp = di.inject(exitAppInjectable);
 
     return {
+      id: "setup-device-shutdown",
       run: () => {
         powerMonitor.on("shutdown", async () => {
           exitApp();
diff --git a/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts b/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts
index 24f90f01b3..7bb4a8e540 100644
--- a/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts
+++ b/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts
@@ -3,49 +3,40 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import directoryForLensLocalStorageInjectable from "../../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable";
 import { setupIpcMainHandlers } from "./setup-ipc-main-handlers";
 import loggerInjectable from "../../../../common/logger.injectable";
-import clusterManagerInjectable from "../../../cluster-manager.injectable";
-import applicationMenuItemsInjectable from "../../../menu/application-menu-items.injectable";
-import getAbsolutePathInjectable from "../../../../common/path/get-absolute-path.injectable";
 import clusterStoreInjectable from "../../../../common/cluster-store/cluster-store.injectable";
 import { onLoadOfApplicationInjectionToken } from "../../../start-main-application/runnable-tokens/on-load-of-application-injection-token";
 import operatingSystemThemeInjectable from "../../../theme/operating-system-theme.injectable";
 import catalogEntityRegistryInjectable from "../../../catalog/entity-registry.injectable";
 import askUserForFilePathsInjectable from "../../../ipc/ask-user-for-file-paths.injectable";
+import applicationMenuItemCompositeInjectable from "../../../../features/application-menu/main/application-menu-item-composite.injectable";
+import emitAppEventInjectable from "../../../../common/app-event-bus/emit-event.injectable";
 
 const setupIpcMainHandlersInjectable = getInjectable({
   id: "setup-ipc-main-handlers",
 
   instantiate: (di) => {
     const logger = di.inject(loggerInjectable);
-
-    const directoryForLensLocalStorage = di.inject(
-      directoryForLensLocalStorageInjectable,
-    );
-
-    const clusterManager = di.inject(clusterManagerInjectable);
-    const applicationMenuItems = di.inject(applicationMenuItemsInjectable);
-    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const applicationMenuItemComposite = di.inject(applicationMenuItemCompositeInjectable);
     const catalogEntityRegistry = di.inject(catalogEntityRegistryInjectable);
     const clusterStore = di.inject(clusterStoreInjectable);
     const operatingSystemTheme = di.inject(operatingSystemThemeInjectable);
     const askUserForFilePaths = di.inject(askUserForFilePathsInjectable);
+    const emitAppEvent = di.inject(emitAppEventInjectable);
 
     return {
+      id: "setup-ipc-main-handlers",
       run: () => {
         logger.debug("[APP-MAIN] initializing ipc main handlers");
 
         setupIpcMainHandlers({
-          applicationMenuItems,
-          getAbsolutePath,
-          directoryForLensLocalStorage,
-          clusterManager,
+          applicationMenuItemComposite,
           catalogEntityRegistry,
           clusterStore,
           operatingSystemTheme,
           askUserForFilePaths,
+          emitAppEvent,
         });
       },
     };
diff --git a/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.ts b/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.ts
index 9342696c77..cb6a642a6a 100644
--- a/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.ts
+++ b/src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.ts
@@ -5,38 +5,42 @@
 import type { IpcMainInvokeEvent } from "electron";
 import { BrowserWindow, Menu } from "electron";
 import { clusterFrameMap } from "../../../../common/cluster-frames";
-import { clusterActivateHandler, clusterSetFrameIdHandler, clusterVisibilityHandler, clusterRefreshHandler, clusterDisconnectHandler, clusterKubectlApplyAllHandler, clusterKubectlDeleteAllHandler, clusterDeleteHandler, clusterSetDeletingHandler, clusterClearDeletingHandler } from "../../../../common/ipc/cluster";
+import { clusterActivateHandler, clusterSetFrameIdHandler, clusterDisconnectHandler } from "../../../../common/ipc/cluster";
 import type { ClusterId } from "../../../../common/cluster-types";
 import { ClusterStore } from "../../../../common/cluster-store/cluster-store";
-import { appEventBus } from "../../../../common/app-event-bus/event-bus";
 import { broadcastMainChannel, broadcastMessage, ipcMainHandle, ipcMainOn } from "../../../../common/ipc";
 import type { CatalogEntityRegistry } from "../../../catalog";
 import { pushCatalogToRenderer } from "../../../catalog-pusher";
-import type { ClusterManager } from "../../../cluster-manager";
-import { ResourceApplier } from "../../../resource-applier";
-import { remove } from "fs-extra";
 import type { IComputedValue } from "mobx";
-import type { GetAbsolutePath } from "../../../../common/path/get-absolute-path.injectable";
-import type { MenuItemOpts } from "../../../menu/application-menu-items.injectable";
 import { windowActionHandleChannel, windowLocationChangedChannel, windowOpenAppMenuAsContextMenuChannel } from "../../../../common/ipc/window";
 import { handleWindowAction, onLocationChange } from "../../../ipc/window";
 import { openFilePickingDialogChannel } from "../../../../common/ipc/dialog";
 import { getNativeThemeChannel } from "../../../../common/ipc/native-theme";
 import type { Theme } from "../../../theme/operating-system-theme-state.injectable";
 import type { AskUserForFilePaths } from "../../../ipc/ask-user-for-file-paths.injectable";
+import type { ApplicationMenuItemTypes } from "../../../../features/application-menu/main/menu-items/application-menu-item-injection-token";
+import type { Composite } from "../../../../common/utils/composite/get-composite/get-composite";
+import { getApplicationMenuTemplate } from "../../../../features/application-menu/main/populate-application-menu.injectable";
+import type { MenuItemRoot } from "../../../../features/application-menu/main/application-menu-item-composite.injectable";
+import type { EmitAppEvent } from "../../../../common/app-event-bus/emit-event.injectable";
 
 interface Dependencies {
-  directoryForLensLocalStorage: string;
-  getAbsolutePath: GetAbsolutePath;
-  applicationMenuItems: IComputedValue<MenuItemOpts[]>;
-  clusterManager: ClusterManager;
+  applicationMenuItemComposite: IComputedValue<Composite<ApplicationMenuItemTypes | MenuItemRoot>>;
   catalogEntityRegistry: CatalogEntityRegistry;
   clusterStore: ClusterStore;
   operatingSystemTheme: IComputedValue<Theme>;
   askUserForFilePaths: AskUserForFilePaths;
+  emitAppEvent: EmitAppEvent;
 }
 
-export const setupIpcMainHandlers = ({ applicationMenuItems, directoryForLensLocalStorage, getAbsolutePath, clusterManager, catalogEntityRegistry, clusterStore, operatingSystemTheme, askUserForFilePaths }: Dependencies) => {
+export const setupIpcMainHandlers = ({
+  applicationMenuItemComposite,
+  catalogEntityRegistry,
+  clusterStore,
+  operatingSystemTheme,
+  askUserForFilePaths,
+  emitAppEvent,
+}: Dependencies) => {
   ipcMainHandle(clusterActivateHandler, (event, clusterId: ClusterId, force = false) => {
     return ClusterStore.getInstance()
       .getById(clusterId)
@@ -54,18 +58,8 @@ export const setupIpcMainHandlers = ({ applicationMenuItems, directoryForLensLoc
     }
   });
 
-  ipcMainOn(clusterVisibilityHandler, (event, clusterId?: ClusterId) => {
-    clusterManager.visibleCluster = clusterId;
-  });
-
-  ipcMainHandle(clusterRefreshHandler, (event, clusterId: ClusterId) => {
-    return ClusterStore.getInstance()
-      .getById(clusterId)
-      ?.refresh({ refreshMetadata: true });
-  });
-
   ipcMainHandle(clusterDisconnectHandler, (event, clusterId: ClusterId) => {
-    appEventBus.emit({ name: "cluster", action: "stop" });
+    emitAppEvent({ name: "cluster", action: "stop" });
     const cluster = ClusterStore.getInstance().getById(clusterId);
 
     if (cluster) {
@@ -74,78 +68,6 @@ export const setupIpcMainHandlers = ({ applicationMenuItems, directoryForLensLoc
     }
   });
 
-  ipcMainHandle(clusterDeleteHandler, async (event, clusterId: ClusterId) => {
-    appEventBus.emit({ name: "cluster", action: "remove" });
-
-    const clusterStore = ClusterStore.getInstance();
-    const cluster = clusterStore.getById(clusterId);
-
-    if (!cluster) {
-      return;
-    }
-
-    cluster.disconnect();
-    clusterFrameMap.delete(cluster.id);
-
-    // Remove from the cluster store as well, this should clear any old settings
-    clusterStore.clusters.delete(cluster.id);
-
-    try {
-      // remove the local storage file
-      const localStorageFilePath = getAbsolutePath(directoryForLensLocalStorage, `${cluster.id}.json`);
-
-      await remove(localStorageFilePath);
-    } catch {
-      // ignore error
-    }
-  });
-
-  ipcMainHandle(clusterSetDeletingHandler, (event, clusterId: string) => {
-    clusterManager.deleting.add(clusterId);
-  });
-
-  ipcMainHandle(clusterClearDeletingHandler, (event, clusterId: string) => {
-    clusterManager.deleting.delete(clusterId);
-  });
-
-  ipcMainHandle(clusterKubectlApplyAllHandler, async (event, clusterId: ClusterId, resources: string[], extraArgs: string[]) => {
-    appEventBus.emit({ name: "cluster", action: "kubectl-apply-all" });
-    const cluster = ClusterStore.getInstance().getById(clusterId);
-
-    if (cluster) {
-      const applier = new ResourceApplier(cluster);
-
-      try {
-        const stdout = await applier.kubectlApplyAll(resources, extraArgs);
-
-        return { stdout };
-      } catch (error: any) {
-        return { stderr: error };
-      }
-    } else {
-      throw `${clusterId} is not a valid cluster id`;
-    }
-  });
-
-  ipcMainHandle(clusterKubectlDeleteAllHandler, async (event, clusterId: ClusterId, resources: string[], extraArgs: string[]) => {
-    appEventBus.emit({ name: "cluster", action: "kubectl-delete-all" });
-    const cluster = ClusterStore.getInstance().getById(clusterId);
-
-    if (cluster) {
-      const applier = new ResourceApplier(cluster);
-
-      try {
-        const stdout = await applier.kubectlDeleteAll(resources, extraArgs);
-
-        return { stdout };
-      } catch (error: any) {
-        return { stderr: error };
-      }
-    } else {
-      throw `${clusterId} is not a valid cluster id`;
-    }
-  });
-
   ipcMainHandle(windowActionHandleChannel, (event, action) => handleWindowAction(action));
 
   ipcMainOn(windowLocationChangedChannel, () => onLocationChange());
@@ -155,9 +77,8 @@ export const setupIpcMainHandlers = ({ applicationMenuItems, directoryForLensLoc
   ipcMainHandle(broadcastMainChannel, (event, channel, ...args) => broadcastMessage(channel, ...args));
 
   ipcMainOn(windowOpenAppMenuAsContextMenuChannel, async (event) => {
-    const appMenu = applicationMenuItems.get();
-
-    const menu = Menu.buildFromTemplate(appMenu);
+    const electronTemplate = getApplicationMenuTemplate(applicationMenuItemComposite.get());
+    const menu = Menu.buildFromTemplate(electronTemplate);
 
     menu.popup({
       ...BrowserWindow.fromWebContents(event.sender),
diff --git a/src/main/electron-app/runnables/setup-main-window-visibility-after-activation.injectable.ts b/src/main/electron-app/runnables/setup-main-window-visibility-after-activation.injectable.ts
index 3642fa3c6d..c32cfe0765 100644
--- a/src/main/electron-app/runnables/setup-main-window-visibility-after-activation.injectable.ts
+++ b/src/main/electron-app/runnables/setup-main-window-visibility-after-activation.injectable.ts
@@ -17,6 +17,7 @@ const setupMainWindowVisibilityAfterActivationInjectable = getInjectable({
     const logger = di.inject(loggerInjectable);
 
     return {
+      id: "setup-main-window-visibility-after-activation",
       run: () => {
         app.on("activate", async (_, windowIsVisible) => {
           logger.info("APP:ACTIVATE", { hasVisibleWindows: windowIsVisible });
diff --git a/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts b/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts
index 8e724fdf50..fe501d4750 100644
--- a/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts
+++ b/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts
@@ -13,14 +13,14 @@ const setupRunnablesAfterWindowIsOpenedInjectable = getInjectable({
 
   instantiate: (di) => {
     const afterWindowIsOpened = runManyFor(di)(afterWindowIsOpenedInjectionToken);
+    const app = di.inject(electronAppInjectable);
 
     return {
+      id: "setup-runnables-after-window-is-opened",
       run: () => {
-        const app = di.inject(electronAppInjectable);
+        app.on("browser-window-created", () => afterWindowIsOpened);
 
-        app.on("browser-window-created", async () => {
-          await afterWindowIsOpened();
-        });
+        return undefined;
       },
     };
   },
diff --git a/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts b/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts
index bb2c8f8970..c0bc3ae620 100644
--- a/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts
+++ b/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts
@@ -15,23 +15,16 @@ const setupRunnablesBeforeClosingOfApplicationInjectable = getInjectable({
   id: "setup-closing-of-application",
 
   instantiate: (di) => {
-    const runMany = runManySyncFor(di);
-
-    const runRunnablesBeforeQuitOfFrontEnd = runMany(
-      beforeQuitOfFrontEndInjectionToken,
-    );
-
-    const runRunnablesBeforeQuitOfBackEnd = runMany(
-      beforeQuitOfBackEndInjectionToken,
-    );
+    const runManySync = runManySyncFor(di);
+    const runRunnablesBeforeQuitOfFrontEnd = runManySync(beforeQuitOfFrontEndInjectionToken);
+    const runRunnablesBeforeQuitOfBackEnd = runManySync(beforeQuitOfBackEndInjectionToken);
+    const app = di.inject(electronAppInjectable);
+    const isIntegrationTesting = di.inject(isIntegrationTestingInjectable);
+    const autoUpdater = di.inject(autoUpdaterInjectable);
 
     return {
+      id: "setup-closing-of-application",
       run: () => {
-        const app = di.inject(electronAppInjectable);
-
-        const isIntegrationTesting = di.inject(isIntegrationTestingInjectable);
-        const autoUpdater = di.inject(autoUpdaterInjectable);
-
         let isAutoUpdating = false;
 
         autoUpdater.on("before-quit-for-update", () => {
@@ -50,6 +43,8 @@ const setupRunnablesBeforeClosingOfApplicationInjectable = getInjectable({
             event.preventDefault();
           }
         });
+
+        return undefined;
       },
     };
   },
diff --git a/src/main/get-metrics.injectable.ts b/src/main/get-metrics.injectable.ts
index 4d6634909c..0ceaf01735 100644
--- a/src/main/get-metrics.injectable.ts
+++ b/src/main/get-metrics.injectable.ts
@@ -4,10 +4,10 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import type { Cluster } from "../common/cluster/cluster";
-import type { IMetricsReqParams } from "../common/k8s-api/endpoints/metrics.api";
+import type { RequestMetricsParams } from "../common/k8s-api/endpoints/metrics.api/request-metrics.injectable";
 import k8sRequestInjectable from "./k8s-request.injectable";
 
-export type GetMetrics = (cluster: Cluster, prometheusPath: string, queryParams: IMetricsReqParams & { query: string }) => Promise<any>;
+export type GetMetrics = (cluster: Cluster, prometheusPath: string, queryParams: RequestMetricsParams & { query: string }) => Promise<any>;
 
 const getMetricsInjectable = getInjectable({
   id: "get-metrics",
diff --git a/src/main/getDi.ts b/src/main/getDi.ts
index 17d9cc36b7..8b71cca39b 100644
--- a/src/main/getDi.ts
+++ b/src/main/getDi.ts
@@ -19,10 +19,10 @@ export const getDi = () => {
     autoRegister({
       di,
       requireContexts: [
-        require.context("./", true, /\.injectable\.(ts|tsx)$/),
-        require.context("../extensions", true, /\.injectable\.(ts|tsx)$/),
-        require.context("../common", true, /\.injectable\.(ts|tsx)$/),
-        require.context("../features", true, /.*\/(main|common)\/.*\.injectable\.(ts|tsx)$/),
+        require.context("./", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
+        require.context("../extensions", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
+        require.context("../common", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
+        require.context("../features", true, CONTEXT_MATCHER_FOR_FEATURES),
       ],
     });
   });
diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts
index f63e6f0518..d8f87d8692 100644
--- a/src/main/getDiForUnitTesting.ts
+++ b/src/main/getDiForUnitTesting.ts
@@ -5,9 +5,8 @@
 
 import { kebabCase, noop, chunk } from "lodash/fp";
 import type { DiContainer, Injectable } from "@ogre-tools/injectable";
-import { createContainer } from "@ogre-tools/injectable";
+import { createContainer, isInjectable } from "@ogre-tools/injectable";
 import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
-import appNameInjectable from "./app-paths/app-name/app-name.injectable";
 import writeJsonFileInjectable from "../common/fs/write-json-file.injectable";
 import readJsonFileInjectable from "../common/fs/read-json-file.injectable";
 import readFileInjectable from "../common/fs/read-file.injectable";
@@ -19,25 +18,16 @@ import fileSystemProvisionerStoreInjectable from "../extensions/extension-loader
 import type { FileSystemProvisionerStore } from "../extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store";
 import userStoreInjectable from "../common/user-store/user-store.injectable";
 import type { UserStore } from "../common/user-store";
-import getAbsolutePathInjectable from "../common/path/get-absolute-path.injectable";
-import { getAbsolutePathFake } from "../common/test-utils/get-absolute-path-fake";
-import joinPathsInjectable from "../common/path/join-paths.injectable";
-import { joinPathsFake } from "../common/test-utils/join-paths-fake";
 import hotbarStoreInjectable from "../common/hotbars/store.injectable";
-import appEventBusInjectable from "../common/app-event-bus/app-event-bus.injectable";
-import { EventEmitter } from "../common/event-emitter";
-import type { AppEvent } from "../common/app-event-bus/event-bus";
 import commandLineArgumentsInjectable from "./utils/command-line-arguments.injectable";
 import initializeExtensionsInjectable from "./start-main-application/runnables/initialize-extensions.injectable";
 import lensResourcesDirInjectable from "../common/vars/lens-resources-dir.injectable";
 import environmentVariablesInjectable from "../common/utils/environment-variables.injectable";
 import setupIpcMainHandlersInjectable from "./electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable";
 import setupLensProxyInjectable from "./start-main-application/runnables/setup-lens-proxy.injectable";
-import setupSentryInjectable from "./start-main-application/runnables/setup-sentry.injectable";
-import setupShellInjectable from "./start-main-application/runnables/setup-shell.injectable";
+import setupShellInjectable from "../features/shell-sync/main/setup-shell.injectable";
 import setupSyncingOfWeblinksInjectable from "./start-main-application/runnables/setup-syncing-of-weblinks.injectable";
 import stopServicesAndExitAppInjectable from "./stop-services-and-exit-app.injectable";
-import applicationMenuInjectable from "./menu/application-menu.injectable";
 import isDevelopmentInjectable from "../common/vars/is-development.injectable";
 import setupSystemCaInjectable from "./start-main-application/runnables/setup-system-ca.injectable";
 import setupDeepLinkingInjectable from "./electron-app/runnables/setup-deep-linking.injectable";
@@ -63,22 +53,16 @@ import broadcastMessageInjectable from "../common/ipc/broadcast-message.injectab
 import getElectronThemeInjectable from "./electron-app/features/get-electron-theme.injectable";
 import syncThemeFromOperatingSystemInjectable from "./electron-app/features/sync-theme-from-operating-system.injectable";
 import platformInjectable from "../common/vars/platform.injectable";
-import productNameInjectable from "./app-paths/app-name/product-name.injectable";
 import electronQuitAndInstallUpdateInjectable from "./electron-app/features/electron-quit-and-install-update.injectable";
 import electronUpdaterIsActiveInjectable from "./electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "./application-update/publish-is-configured.injectable";
-import checkForPlatformUpdatesInjectable from "./application-update/check-for-platform-updates/check-for-platform-updates.injectable";
 import baseBundledBinariesDirectoryInjectable from "../common/vars/base-bundled-binaries-dir.injectable";
 import setUpdateOnQuitInjectable from "./electron-app/features/set-update-on-quit.injectable";
-import downloadPlatformUpdateInjectable from "./application-update/download-platform-update/download-platform-update.injectable";
 import startCatalogSyncInjectable from "./catalog-sync-to-renderer/start-catalog-sync.injectable";
 import startKubeConfigSyncInjectable from "./start-main-application/runnables/kube-config-sync/start-kube-config-sync.injectable";
-import appVersionInjectable from "../common/vars/app-version.injectable";
 import getRandomIdInjectable from "../common/utils/get-random-id.injectable";
-import periodicalCheckForUpdatesInjectable from "./application-update/periodical-check-for-updates/periodical-check-for-updates.injectable";
 import execFileInjectable from "../common/fs/exec-file.injectable";
 import normalizedPlatformArchitectureInjectable from "../common/vars/normalized-platform-architecture.injectable";
-import getHelmChartInjectable from "./helm/helm-service/get-helm-chart.injectable";
+import getHelmChartVersionsInjectable from "./helm/helm-service/get-helm-chart-versions.injectable";
 import getHelmChartValuesInjectable from "./helm/helm-service/get-helm-chart-values.injectable";
 import listHelmChartsInjectable from "./helm/helm-service/list-helm-charts.injectable";
 import deleteHelmReleaseInjectable from "./helm/helm-service/delete-helm-release.injectable";
@@ -92,6 +76,9 @@ import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
 import electronInjectable from "./utils/resolve-system-proxy/electron.injectable";
 import type { HotbarStore } from "../common/hotbars/store";
 import focusApplicationInjectable from "./electron-app/features/focus-application.injectable";
+import kubectlDownloadingNormalizedArchInjectable from "./kubectl/normalized-arch.injectable";
+import initializeClusterManagerInjectable from "./cluster/initialize-manager.injectable";
+import addKubeconfigSyncAsEntitySourceInjectable from "./start-main-application/runnables/kube-config-sync/add-source.injectable";
 import type { GlobalOverride } from "../common/test-utils/get-global-override";
 
 export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) {
@@ -105,8 +92,12 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
 
   di.preventSideEffects();
 
-  const injectables: Injectable<any, any, any>[] = (global as any).mainInjectablePaths.map(
-    (filePath: string) => require(filePath).default,
+  const injectables: Injectable<any, any, any>[] = (
+    global as any
+  ).mainInjectablePaths.flatMap((filePath: string) =>
+    Object.values(require(filePath)).filter(
+      (maybeInjectable: any) => isInjectable(maybeInjectable),
+    ),
   );
 
   runInAction(() => {
@@ -129,14 +120,18 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
     di.override(electronInjectable, () => ({}));
     di.override(waitUntilBundledExtensionsAreLoadedInjectable, () => async () => {});
     di.override(getRandomIdInjectable, () => () => "some-irrelevant-random-id");
-
+    di.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64");
     di.override(hotbarStoreInjectable, () => ({
       load: () => {},
       getActive: () => ({ name: "some-hotbar", items: [] }),
       getDisplayIndex: () => "0",
     }) as unknown as HotbarStore);
 
-    di.override(userStoreInjectable, () => ({ startMainReactions: () => {}, extensionRegistryUrl: { customUrl: "some-custom-url" }}) as UserStore);
+    di.override(userStoreInjectable, () => ({
+      startMainReactions: () => {},
+      extensionRegistryUrl: { customUrl: "some-custom-url" },
+      load: () => {},
+    }) as Partial<UserStore> as UserStore);
     di.override(extensionsStoreInjectable, () => ({ isEnabled: (opts) => (void opts, false) }) as ExtensionsStore);
     di.override(fileSystemProvisionerStoreInjectable, () => ({}) as FileSystemProvisionerStore);
 
@@ -148,20 +143,13 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
     di.override(environmentVariablesInjectable, () => ({}));
     di.override(commandLineArgumentsInjectable, () => []);
 
-    di.override(productNameInjectable, () => "some-product-name");
-    di.override(appVersionInjectable, () => "1.0.0");
-
     di.override(clusterFramesInjectable, () => observable.map<string, ClusterFrameInfo>());
 
     di.override(stopServicesAndExitAppInjectable, () => () => {});
     di.override(lensResourcesDirInjectable, () => "/irrelevant");
 
-    di.override(applicationMenuInjectable, () => ({ start: () => {}, stop: () => {} }));
-
-    di.override(periodicalCheckForUpdatesInjectable, () => ({ start: () => {}, stop: () => {}, started: false }));
-
     overrideFunctionalInjectables(di, [
-      getHelmChartInjectable,
+      getHelmChartVersionsInjectable,
       getHelmChartValuesInjectable,
       listHelmChartsInjectable,
       deleteHelmReleaseInjectable,
@@ -176,10 +164,6 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
       execFileInjectable,
     ]);
 
-    // TODO: Remove usages of globally exported appEventBus to get rid of this
-    di.override(appEventBusInjectable, () => new EventEmitter<[AppEvent]>());
-
-    di.override(appNameInjectable, () => "some-app-name");
     di.override(broadcastMessageInjectable, () => (channel) => {
       throw new Error(`Tried to broadcast message to channel "${channel}" over IPC without explicit override.`);
     });
@@ -208,9 +192,10 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
 const overrideRunnablesHavingSideEffects = (di: DiContainer) => {
   [
     initializeExtensionsInjectable,
+    initializeClusterManagerInjectable,
+    addKubeconfigSyncAsEntitySourceInjectable,
     setupIpcMainHandlersInjectable,
     setupLensProxyInjectable,
-    setupSentryInjectable,
     setupShellInjectable,
     setupSyncingOfWeblinksInjectable,
     setupSystemCaInjectable,
@@ -219,30 +204,33 @@ const overrideRunnablesHavingSideEffects = (di: DiContainer) => {
     startCatalogSyncInjectable,
     startKubeConfigSyncInjectable,
   ].forEach((injectable) => {
-    di.override(injectable, () => ({ run: () => {} }));
+    di.override(injectable, () => ({
+      id: injectable.id,
+      run: () => {},
+    }));
   });
 };
 
 const overrideOperatingSystem = (di: DiContainer) => {
   di.override(platformInjectable, () => "darwin");
-  di.override(getAbsolutePathInjectable, () => getAbsolutePathFake);
-  di.override(joinPathsInjectable, () => joinPathsFake);
   di.override(normalizedPlatformArchitectureInjectable, () => "arm64");
 };
 
 const overrideElectronFeatures = (di: DiContainer) => {
-  di.override(setupMainWindowVisibilityAfterActivationInjectable, () => ({
-    run: () => {},
-  }));
+  [
+    setupMainWindowVisibilityAfterActivationInjectable,
+    setupDeviceShutdownInjectable,
+    setupDeepLinkingInjectable,
+    setupApplicationNameInjectable,
+    setupRunnablesBeforeClosingOfApplicationInjectable,
+  ].forEach((injectable) => {
+    di.override(injectable, () => ({
+      id: injectable.id,
+      run: () => {},
+    }));
+  });
 
-  di.override(setupDeviceShutdownInjectable, () => ({
-    run: () => {},
-  }));
-
-  di.override(setupDeepLinkingInjectable, () => ({ run: () => {} }));
   di.override(exitAppInjectable, () => () => {});
-  di.override(setupApplicationNameInjectable, () => ({ run: () => {} }));
-  di.override(setupRunnablesBeforeClosingOfApplicationInjectable, () => ({ run: () => {} }));
   di.override(getCommandLineSwitchInjectable, () => () => "irrelevant");
   di.override(requestSingleInstanceLockInjectable, () => () => true);
   di.override(disableHardwareAccelerationInjectable, () => () => {});
@@ -253,20 +241,14 @@ const overrideElectronFeatures = (di: DiContainer) => {
   di.override(syncThemeFromOperatingSystemInjectable, () => ({ start: () => {}, stop: () => {} }));
   di.override(electronQuitAndInstallUpdateInjectable, () => () => {});
   di.override(setUpdateOnQuitInjectable, () => () => {});
-  di.override(downloadPlatformUpdateInjectable, () => async () => ({ downloadWasSuccessful: true }));
   di.override(focusApplicationInjectable, () => () => {});
 
-  di.override(checkForPlatformUpdatesInjectable, () => () => {
-    throw new Error("Tried to check for platform updates without explicit override.");
-  });
-
   di.override(
     getElectronAppPathInjectable,
-    () => (name: string) => `some-electron-app-path-for-${kebabCase(name)}`,
+    () => (name: string) => `/some-electron-app-path-for-${kebabCase(name)}`,
   );
 
   di.override(setElectronAppPathInjectable, () => () => {});
-  di.override(publishIsConfiguredInjectable, () => false);
   di.override(electronUpdaterIsActiveInjectable, () => false);
 };
 
diff --git a/src/main/helm/__tests__/helm-service.test.ts b/src/main/helm/__tests__/helm-service.test.ts
index ea0a28b1e9..982a361f30 100644
--- a/src/main/helm/__tests__/helm-service.test.ts
+++ b/src/main/helm/__tests__/helm-service.test.ts
@@ -8,7 +8,7 @@ import listHelmChartsInjectable from "../helm-service/list-helm-charts.injectabl
 import getActiveHelmRepositoriesInjectable from "../repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
 import type { AsyncResult } from "../../../common/utils/async-result";
 import type { HelmRepo } from "../../../common/helm/helm-repo";
-import { sortCharts } from "../../../common/utils";
+import { sortBySemverVersion } from "../../../common/utils";
 import helmChartManagerInjectable from "../helm-chart-manager.injectable";
 
 describe("Helm Service tests", () => {
@@ -203,7 +203,7 @@ describe("Helm Service tests", () => {
 
 const charts = new Map([
   ["stable", {
-    "invalid-semver": sortCharts([
+    "invalid-semver": sortBySemverVersion([
       {
         apiVersion: "3.0.0",
         name: "weird-versioning",
@@ -237,7 +237,7 @@ const charts = new Map([
         created: "now",
       },
     ]),
-    "apm-server": sortCharts([
+    "apm-server": sortBySemverVersion([
       {
         apiVersion: "3.0.0",
         name: "apm-server",
@@ -255,7 +255,7 @@ const charts = new Map([
         created: "now",
       },
     ]),
-    "redis": sortCharts([
+    "redis": sortBySemverVersion([
       {
         apiVersion: "3.0.0",
         name: "apm-server",
@@ -275,7 +275,7 @@ const charts = new Map([
     ]),
   }],
   ["experiment", {
-    "fairwind": sortCharts([
+    "fairwind": sortBySemverVersion([
       {
         apiVersion: "3.0.0",
         name: "fairwind",
@@ -296,7 +296,7 @@ const charts = new Map([
     ]),
   }],
   ["bitnami", {
-    "hotdog": sortCharts([
+    "hotdog": sortBySemverVersion([
       {
         apiVersion: "3.0.0",
         name: "hotdog",
@@ -314,7 +314,7 @@ const charts = new Map([
         created: "now",
       },
     ]),
-    "pretzel": sortCharts([
+    "pretzel": sortBySemverVersion([
       {
         apiVersion: "3.0.0",
         name: "pretzel",
diff --git a/src/main/helm/exec-helm/exec-env.global-override-for-injectable.ts b/src/main/helm/exec-helm/exec-env.global-override-for-injectable.ts
new file mode 100644
index 0000000000..59c376cffd
--- /dev/null
+++ b/src/main/helm/exec-helm/exec-env.global-override-for-injectable.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { computed } from "mobx";
+import { getGlobalOverride } from "../../../common/test-utils/get-global-override";
+import execHelmEnvInjectable from "./exec-env.injectable";
+
+export default getGlobalOverride(execHelmEnvInjectable, () => computed(() => ({})));
diff --git a/src/main/helm/exec-helm/exec-env.injectable.ts b/src/main/helm/exec-helm/exec-env.injectable.ts
new file mode 100644
index 0000000000..f562dc2d4b
--- /dev/null
+++ b/src/main/helm/exec-helm/exec-env.injectable.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import userStoreInjectable from "../../../common/user-store/user-store.injectable";
+
+const execHelmEnvInjectable = getInjectable({
+  id: "exec-helm-env",
+  instantiate: (di) => {
+    const userStore = di.inject(userStoreInjectable);
+
+    return computed(() => {
+      const {
+        HTTPS_PROXY = userStore.httpsProxy,
+        ...env
+      } = process.env;
+
+      return { HTTPS_PROXY, ...env } as Partial<Record<string, string>>;
+    });
+  },
+  causesSideEffects: true,
+});
+
+export default execHelmEnvInjectable;
diff --git a/src/main/helm/exec-helm/exec-helm.injectable.ts b/src/main/helm/exec-helm/exec-helm.injectable.ts
index dbe65eda34..034ab43248 100644
--- a/src/main/helm/exec-helm/exec-helm.injectable.ts
+++ b/src/main/helm/exec-helm/exec-helm.injectable.ts
@@ -3,31 +3,26 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
+import type { ExecFileException } from "child_process";
 import execFileInjectable from "../../../common/fs/exec-file.injectable";
-import helmBinaryPathInjectable from "../helm-binary-path.injectable";
 import type { AsyncResult } from "../../../common/utils/async-result";
-import { getErrorMessage } from "../../../common/utils/get-error-message";
+import helmBinaryPathInjectable from "../helm-binary-path.injectable";
+import execHelmEnvInjectable from "./exec-env.injectable";
 
-export type ExecHelm = (args: string[]) => Promise<AsyncResult<string>>;
+export type ExecHelm = (args: string[]) => Promise<AsyncResult<string, ExecFileException & { stderr: string }>>;
 
 const execHelmInjectable = getInjectable({
   id: "exec-helm",
 
   instantiate: (di): ExecHelm => {
     const execFile = di.inject(execFileInjectable);
+    const execHelmEnv = di.inject(execHelmEnvInjectable);
     const helmBinaryPath = di.inject(helmBinaryPathInjectable);
 
-    return async (args) => {
-      try {
-        const response = await execFile(helmBinaryPath, args, {
-          maxBuffer: 32 * 1024 * 1024 * 1024, // 32 MiB
-        });
-
-        return { callWasSuccessful: true, response };
-      } catch (error) {
-        return { callWasSuccessful: false, error: getErrorMessage(error) };
-      }
-    };
+    return async (args) => execFile(helmBinaryPath, args, {
+      maxBuffer: 32 * 1024 * 1024 * 1024, // 32 MiB
+      env: execHelmEnv.get(),
+    });
   },
 });
 
diff --git a/src/main/helm/exec.ts b/src/main/helm/exec.ts
index 2847ce6102..6dbaa3f000 100644
--- a/src/main/helm/exec.ts
+++ b/src/main/helm/exec.ts
@@ -6,9 +6,10 @@
 import { promiseExecFile } from "../../common/utils/promise-exec";
 import type { ObjectEncodingOptions } from "fs";
 import type { ExecFileOptions, ExecFileOptionsWithStringEncoding } from "child_process";
-import { helmBinaryPath } from "../../common/vars";
 import { UserStore } from "../../common/user-store";
 import { isChildProcessError } from "../../common/utils";
+import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
+import helmBinaryPathInjectable from "./helm-binary-path.injectable";
 
 /**
  * ExecFile the bundled helm CLI
@@ -19,6 +20,8 @@ export async function execHelm(args: string[], { encoding, ...rest }: ObjectEnco
     encoding: encoding ?? "utf-8",
     ...rest,
   };
+  const di = getLegacyGlobalDiForExtensionApi();
+  const helmBinaryPath = di.inject(helmBinaryPathInjectable);
 
   try {
     const opts = { ...options };
@@ -29,7 +32,7 @@ export async function execHelm(args: string[], { encoding, ...rest }: ObjectEnco
       opts.env.HTTPS_PROXY = UserStore.getInstance().httpsProxy;
     }
 
-    const { stdout } = await promiseExecFile(helmBinaryPath.get(), args, opts);
+    const { stdout } = await promiseExecFile(helmBinaryPath, args, opts);
 
     return stdout;
   } catch (error) {
diff --git a/src/main/helm/get-helm-env/get-helm-env.injectable.ts b/src/main/helm/get-helm-env/get-helm-env.injectable.ts
index d6c362a17b..bb74c53f99 100644
--- a/src/main/helm/get-helm-env/get-helm-env.injectable.ts
+++ b/src/main/helm/get-helm-env/get-helm-env.injectable.ts
@@ -21,7 +21,7 @@ const getHelmEnvInjectable = getInjectable({
       const result = await execHelm(["env"]);
 
       if (!result.callWasSuccessful) {
-        return { callWasSuccessful: false, error: result.error };
+        return { callWasSuccessful: false, error: result.error.stderr };
       }
 
       const lines = result.response.split(/\r?\n/); // split by new line feed
diff --git a/src/main/helm/helm-binary-path.injectable.ts b/src/main/helm/helm-binary-path.injectable.ts
index d5983572c7..19913dfcca 100644
--- a/src/main/helm/helm-binary-path.injectable.ts
+++ b/src/main/helm/helm-binary-path.injectable.ts
@@ -3,23 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { getBinaryName } from "../../common/vars";
-import getAbsolutePathInjectable from "../../common/path/get-absolute-path.injectable";
-import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
-import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
+import bundledBinaryPathInjectable from "../../common/utils/bundled-binary-path.injectable";
 
 const helmBinaryPathInjectable = getInjectable({
   id: "helm-binary-path",
-
-  instantiate: (di) => {
-    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
-    const normalizedPlatform = di.inject(normalizedPlatformInjectable);
-    const baseBundledBinariesDirectory = di.inject(baseBundledBinariesDirectoryInjectable);
-
-    const helmBinaryName = getBinaryName("helm", { forPlatform: normalizedPlatform });
-
-    return getAbsolutePath(baseBundledBinariesDirectory, helmBinaryName);
-  },
+  instantiate: (di) => di.inject(bundledBinaryPathInjectable, "helm"),
 });
 
 export default helmBinaryPathInjectable;
diff --git a/src/main/helm/helm-chart-manager.ts b/src/main/helm/helm-chart-manager.ts
index 2eae449aea..dfc80a78e4 100644
--- a/src/main/helm/helm-chart-manager.ts
+++ b/src/main/helm/helm-chart-manager.ts
@@ -5,14 +5,14 @@
 
 import fs from "fs";
 import * as yaml from "js-yaml";
-import type { RepoHelmChartList } from "../../common/k8s-api/endpoints/helm-charts.api";
-import { iter, put, sortCharts } from "../../common/utils";
+import { iter, put, sortBySemverVersion } from "../../common/utils";
 import { execHelm } from "./exec";
 import type { SetRequired } from "type-fest";
 import { assert } from "console";
 import type { HelmRepo } from "../../common/helm/helm-repo";
 import type { HelmChartManagerCache } from "./helm-chart-manager-cache.injectable";
 import type { Logger } from "../../common/logger";
+import type { RepoHelmChartList } from "../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable";
 
 export interface HelmCacheFile {
   apiVersion: string;
@@ -118,7 +118,7 @@ function normalizeHelmCharts(repoName: string, entries: RepoHelmChartList): Repo
         Object.entries(entries),
         ([name, charts]) => [
           name,
-          sortCharts(
+          sortBySemverVersion(
             charts.map(chart => ({
               ...chart,
               created: Date.parse(chart.created).toString(),
diff --git a/src/main/helm/helm-service/get-helm-chart-readme.global-override-for-injectable.ts b/src/main/helm/helm-service/get-helm-chart-readme.global-override-for-injectable.ts
new file mode 100644
index 0000000000..6d2c016251
--- /dev/null
+++ b/src/main/helm/helm-service/get-helm-chart-readme.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../../../common/test-utils/get-global-override";
+import getHelmChartReadmeInjectable from "./get-helm-chart-readme.injectable";
+
+export default getGlobalOverride(getHelmChartReadmeInjectable, () => () => {
+  throw new Error("tried to get a helm chart's readme without overriding");
+});
diff --git a/src/main/helm/helm-service/get-helm-chart.injectable.ts b/src/main/helm/helm-service/get-helm-chart-readme.injectable.ts
similarity index 73%
rename from src/main/helm/helm-service/get-helm-chart.injectable.ts
rename to src/main/helm/helm-service/get-helm-chart-readme.injectable.ts
index bd9615a3c4..ff5aa2fd0a 100644
--- a/src/main/helm/helm-service/get-helm-chart.injectable.ts
+++ b/src/main/helm/helm-service/get-helm-chart-readme.injectable.ts
@@ -7,8 +7,8 @@ import getActiveHelmRepositoryInjectable from "../repositories/get-active-helm-r
 import type { HelmRepo } from "../../../common/helm/helm-repo";
 import helmChartManagerInjectable from "../helm-chart-manager.injectable";
 
-const getHelmChartInjectable = getInjectable({
-  id: "get-helm-chart",
+const getHelmChartReadmeInjectable = getInjectable({
+  id: "get-helm-chart-readme",
 
   instantiate: (di) => {
     const getActiveHelmRepository = di.inject(getActiveHelmRepositoryInjectable);
@@ -21,16 +21,11 @@ const getHelmChartInjectable = getInjectable({
         return undefined;
       }
 
-      const chartManager = getChartManager(repo);
-
-      return {
-        readme: await chartManager.getReadme(chartName, version),
-        versions: await chartManager.chartVersions(chartName),
-      };
+      return getChartManager(repo).getReadme(chartName, version);
     };
   },
 
   causesSideEffects: true,
 });
 
-export default getHelmChartInjectable;
+export default getHelmChartReadmeInjectable;
diff --git a/src/main/helm/helm-service/get-helm-chart-versions.injectable.ts b/src/main/helm/helm-service/get-helm-chart-versions.injectable.ts
new file mode 100644
index 0000000000..8c55ea7921
--- /dev/null
+++ b/src/main/helm/helm-service/get-helm-chart-versions.injectable.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { HelmRepo } from "../../../common/helm/helm-repo";
+import helmChartManagerInjectable from "../helm-chart-manager.injectable";
+import getActiveHelmRepositoryInjectable from "../repositories/get-active-helm-repository.injectable";
+
+const getHelmChartVersionsInjectable = getInjectable({
+  id: "get-helm-chart-versions",
+
+  instantiate: (di) => {
+    const getActiveHelmRepository = di.inject(getActiveHelmRepositoryInjectable);
+    const getChartManager = (repo: HelmRepo) => di.inject(helmChartManagerInjectable, repo);
+
+    return async (repoName: string, chartName: string) => {
+      const repo = await getActiveHelmRepository(repoName);
+
+      if (!repo) {
+        return undefined;
+      }
+
+      return getChartManager(repo).chartVersions(chartName);
+    };
+  },
+
+  causesSideEffects: true,
+});
+
+export default getHelmChartVersionsInjectable;
diff --git a/src/main/helm/helm-service/get-helm-release-resources/call-for-helm-manifest/call-for-helm-manifest.injectable.ts b/src/main/helm/helm-service/get-helm-release-resources/call-for-helm-manifest/call-for-helm-manifest.injectable.ts
index 490c67273e..b5176b25b9 100644
--- a/src/main/helm/helm-service/get-helm-release-resources/call-for-helm-manifest/call-for-helm-manifest.injectable.ts
+++ b/src/main/helm/helm-service/get-helm-release-resources/call-for-helm-manifest/call-for-helm-manifest.injectable.ts
@@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import type { AsyncResult } from "../../../../../common/utils/async-result";
 import execHelmInjectable from "../../../exec-helm/exec-helm.injectable";
 import yaml from "js-yaml";
-import type { KubeJsonApiData } from "../../../../../common/k8s-api/kube-json-api";
+import type { KubeJsonApiData, KubeJsonApiDataList } from "../../../../../common/k8s-api/kube-json-api";
 
 const callForHelmManifestInjectable = getInjectable({
   id: "call-for-helm-manifest",
@@ -18,7 +18,7 @@ const callForHelmManifestInjectable = getInjectable({
       name: string,
       namespace: string,
       kubeconfigPath: string,
-    ): Promise<AsyncResult<KubeJsonApiData[]>> => {
+    ): Promise<AsyncResult<(KubeJsonApiData | KubeJsonApiDataList)[]>> => {
       const result = await execHelm([
         "get",
         "manifest",
@@ -30,7 +30,7 @@ const callForHelmManifestInjectable = getInjectable({
       ]);
 
       if (!result.callWasSuccessful) {
-        return { callWasSuccessful: false, error: result.error };
+        return { callWasSuccessful: false, error: result.error.message };
       }
 
       return {
diff --git a/src/main/helm/helm-service/get-helm-release-resources/get-helm-release-resources.injectable.ts b/src/main/helm/helm-service/get-helm-release-resources/get-helm-release-resources.injectable.ts
index 025aab6b4d..ce5c60d6b3 100644
--- a/src/main/helm/helm-service/get-helm-release-resources/get-helm-release-resources.injectable.ts
+++ b/src/main/helm/helm-service/get-helm-release-resources/get-helm-release-resources.injectable.ts
@@ -3,48 +3,37 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import callForKubeResourcesByManifestInjectable from "./call-for-kube-resources-by-manifest/call-for-kube-resources-by-manifest.injectable";
-import { groupBy, map } from "lodash/fp";
-import type { JsonObject } from "type-fest";
-import { pipeline } from "@ogre-tools/fp";
 import callForHelmManifestInjectable from "./call-for-helm-manifest/call-for-helm-manifest.injectable";
+import type { KubeJsonApiData, KubeJsonApiDataList } from "../../../../common/k8s-api/kube-json-api";
+import type { AsyncResult } from "../../../../common/utils/async-result";
 
 export type GetHelmReleaseResources = (
   name: string,
   namespace: string,
   kubeconfigPath: string,
-  kubectlPath: string
-) => Promise<JsonObject[]>;
+) => Promise<AsyncResult<KubeJsonApiData[], string>>;
 
 const getHelmReleaseResourcesInjectable = getInjectable({
   id: "get-helm-release-resources",
 
   instantiate: (di): GetHelmReleaseResources => {
     const callForHelmManifest = di.inject(callForHelmManifestInjectable);
-    const callForKubeResourcesByManifest = di.inject(callForKubeResourcesByManifestInjectable);
 
-    return async (name, namespace, kubeconfigPath, kubectlPath) => {
+    return async (name, namespace, kubeconfigPath) => {
       const result = await callForHelmManifest(name, namespace, kubeconfigPath);
 
       if (!result.callWasSuccessful) {
-        throw new Error(result.error);
+        return result;
       }
 
-      const results = await pipeline(
-        result.response,
-
-        groupBy((item) => item.metadata.namespace || namespace),
-
-        (x) => Object.entries(x),
-
-        map(([namespace, manifest]) =>
-          callForKubeResourcesByManifest(namespace, kubeconfigPath, kubectlPath, manifest),
-        ),
-
-        promises => Promise.all(promises),
-      );
-
-      return results.flat(1);
+      return {
+        callWasSuccessful: true,
+        response: result.response.flatMap(item => (
+          Array.isArray(item.items)
+            ? (item as KubeJsonApiDataList).items
+            : item as KubeJsonApiData
+        )),
+      };
     };
   },
 });
diff --git a/src/main/helm/helm-service/get-helm-release-resources/get-helm-release-resources.test.ts b/src/main/helm/helm-service/get-helm-release-resources/get-helm-release-resources.test.ts
index 6c1b1c0566..b10bb650f1 100644
--- a/src/main/helm/helm-service/get-helm-release-resources/get-helm-release-resources.test.ts
+++ b/src/main/helm/helm-service/get-helm-release-resources/get-helm-release-resources.test.ts
@@ -10,9 +10,10 @@ import type { ExecHelm } from "../../exec-helm/exec-helm.injectable";
 import execHelmInjectable from "../../exec-helm/exec-helm.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
-import type { JsonObject } from "type-fest";
 import type { ExecFileWithInput } from "./call-for-kube-resources-by-manifest/exec-file-with-input/exec-file-with-input.injectable";
 import execFileWithInputInjectable from "./call-for-kube-resources-by-manifest/exec-file-with-input/exec-file-with-input.injectable";
+import type { AsyncResult } from "../../../../common/utils/async-result";
+import type { KubeJsonApiData } from "../../../../common/k8s-api/kube-json-api";
 
 describe("get helm release resources", () => {
   let getHelmReleaseResources: GetHelmReleaseResources;
@@ -36,14 +37,13 @@ describe("get helm release resources", () => {
   });
 
   describe("when called", () => {
-    let actualPromise: Promise<JsonObject[]>;
+    let actualPromise: Promise<AsyncResult<KubeJsonApiData[], string>>;
 
     beforeEach(() => {
       actualPromise = getHelmReleaseResources(
         "some-release",
         "some-namespace",
         "/some-kubeconfig-path",
-        "/some-kubectl-path",
       );
     });
 
@@ -65,14 +65,16 @@ describe("get helm release resources", () => {
 
       const actual = await actualPromise;
 
-      expect(actual).toEqual([]);
+      expect(actual).toEqual({
+        callWasSuccessful: true,
+        response: [],
+      });
     });
 
-    describe("when call for manifest resolves", () => {
-      beforeEach(async () => {
-        await execHelmMock.resolve({
-          callWasSuccessful: true,
-          response: `---
+    it("when call to manifest resolves with resources, resolves with resources", async () => {
+      await execHelmMock.resolve({
+        callWasSuccessful: true,
+        response: `---
 apiVersion: v1
 kind: SomeKind
 metadata:
@@ -80,135 +82,63 @@ metadata:
   namespace: some-namespace
 ---
 apiVersion: v1
-kind: SomeKind
+kind: SomeOtherKind
 metadata:
   name: some-resource-without-namespace
 ---
 apiVersion: v1
+kind: List
+items:
+  - apiVersion: monitoring.coreos.com/v1
+    kind: ServiceMonitor
+    metadata:
+      name: collection-sumologic-fluentd-logs
+      namespace: some-namespace
+---
+apiVersion: v1
 kind: SomeKind
 metadata:
   name: some-resource-with-different-namespace
   namespace: some-other-namespace
 ---
 `,
-        });
       });
 
-      it("calls for resources from each namespace separately using the manifest as input", () => {
-        expect(execFileWithStreamInputMock.mock.calls).toEqual([
-          [
-            {
-              filePath: "/some-kubectl-path",
-              commandArguments: ["get", "--kubeconfig", "/some-kubeconfig-path", "-f", "-", "--namespace", "some-namespace", "--output", "json"],
-              input: `---
-apiVersion: v1
-kind: SomeKind
-metadata:
-  name: some-resource-with-same-namespace
-  namespace: some-namespace
----
-apiVersion: v1
-kind: SomeKind
-metadata:
-  name: some-resource-without-namespace
----
-`,
+      expect(await actualPromise).toEqual({
+        callWasSuccessful: true,
+        response: [
+          {
+            apiVersion: "v1",
+            kind: "SomeKind",
+            metadata: {
+              name: "some-resource-with-same-namespace",
+              namespace: "some-namespace",
             },
-          ],
-
-          [
-            {
-              filePath: "/some-kubectl-path",
-              commandArguments: ["get", "--kubeconfig", "/some-kubeconfig-path", "-f", "-", "--namespace", "some-other-namespace", "--output", "json"],
-              input: `---
-apiVersion: v1
-kind: SomeKind
-metadata:
-  name: some-resource-with-different-namespace
-  namespace: some-other-namespace
----
-`,
+          },
+          {
+            apiVersion: "v1",
+            kind: "SomeOtherKind",
+            metadata: {
+              name: "some-resource-without-namespace",
             },
-          ],
-        ]);
-      });
-
-      it("when all calls for resources resolve, resolves with combined result", async () => {
-        await execFileWithStreamInputMock.resolveSpecific(
-          ([{ commandArguments }]) =>
-            commandArguments.includes("some-namespace"),
-          {
-            callWasSuccessful: true,
-
-            response: JSON.stringify({
-              items: [{ some: "item" }],
-
-              kind: "List",
-
-              metadata: {
-                resourceVersion: "",
-                selfLink: "",
-              },
-            }),
           },
-        );
-
-        await execFileWithStreamInputMock.resolveSpecific(
-          ([{ commandArguments }]) =>
-            commandArguments.includes("some-other-namespace"),
           {
-            callWasSuccessful: true,
-
-            response: JSON.stringify({
-              items: [{ some: "other-item" }],
-
-              kind: "List",
-
-              metadata: {
-                resourceVersion: "",
-                selfLink: "",
-              },
-            }),
+            apiVersion: "monitoring.coreos.com/v1",
+            kind: "ServiceMonitor",
+            metadata: {
+              name: "collection-sumologic-fluentd-logs",
+              namespace: "some-namespace",
+            },
           },
-        );
-
-        const actual = await actualPromise;
-
-        expect(actual).toEqual([{ some: "item" }, { some: "other-item" }]);
-      });
-
-      it("given some call fails, when all calls have finished, rejects with failure", async () => {
-        await execFileWithStreamInputMock.resolveSpecific(
-          ([{ commandArguments }]) =>
-            commandArguments.includes("some-namespace"),
-
           {
-            callWasSuccessful: true,
-
-            response: JSON.stringify({
-              items: [{ some: "item" }],
-
-              kind: "List",
-
-              metadata: {
-                resourceVersion: "",
-                selfLink: "",
-              },
-            }),
+            apiVersion: "v1",
+            kind: "SomeKind",
+            metadata: {
+              name: "some-resource-with-different-namespace",
+              namespace: "some-other-namespace",
+            },
           },
-        );
-
-        execFileWithStreamInputMock.resolveSpecific(
-          ([{ commandArguments }]) =>
-            commandArguments.includes("some-other-namespace"),
-
-          {
-            callWasSuccessful: false,
-            error: "some-error",
-          },
-        );
-
-        return expect(actualPromise).rejects.toEqual(expect.any(Error));
+        ],
       });
     });
   });
diff --git a/src/main/helm/helm-service/get-helm-release.injectable.ts b/src/main/helm/helm-service/get-helm-release.injectable.ts
index 3733b2816d..71d3fe6184 100644
--- a/src/main/helm/helm-service/get-helm-release.injectable.ts
+++ b/src/main/helm/helm-service/get-helm-release.injectable.ts
@@ -19,12 +19,10 @@ const getHelmReleaseInjectable = getInjectable({
 
     return async (cluster: Cluster, releaseName: string, namespace: string) => {
       const kubeconfigPath = await cluster.getProxyKubeconfigPath();
-      const kubectl = await cluster.ensureKubectl();
-      const kubectlPath = await kubectl.getPath();
 
       logger.debug("Fetch release");
 
-      const args = [
+      const result = await execHelm([
         "status",
         releaseName,
         "--namespace",
@@ -33,11 +31,11 @@ const getHelmReleaseInjectable = getInjectable({
         kubeconfigPath,
         "--output",
         "json",
-      ];
-
-      const result = await execHelm(args);
+      ]);
 
       if (!result.callWasSuccessful) {
+        logger.warn(`Failed to exectute helm: ${result.error}`);
+
         return undefined;
       }
 
@@ -47,14 +45,22 @@ const getHelmReleaseInjectable = getInjectable({
         return undefined;
       }
 
-      release.resources = await getHelmReleaseResources(
+      const resourcesResult = await getHelmReleaseResources(
         releaseName,
         namespace,
         kubeconfigPath,
-        kubectlPath,
       );
 
-      return release;
+      if (!resourcesResult.callWasSuccessful) {
+        logger.warn(`Failed to get helm release resources: ${resourcesResult.error}`);
+
+        return undefined;
+      }
+
+      return {
+        ...release,
+        resources: resourcesResult.response,
+      };
     };
   },
 
diff --git a/src/main/helm/helm-service/update-helm-release.injectable.ts b/src/main/helm/helm-service/update-helm-release.injectable.ts
index e07269ce6a..f428e7a782 100644
--- a/src/main/helm/helm-service/update-helm-release.injectable.ts
+++ b/src/main/helm/helm-service/update-helm-release.injectable.ts
@@ -5,16 +5,15 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { Cluster } from "../../../common/cluster/cluster";
 import loggerInjectable from "../../../common/logger.injectable";
-import type { JsonObject } from "type-fest";
-import { execHelm } from "../exec";
 import tempy from "tempy";
-import fse from "fs-extra";
-import yaml from "js-yaml";
 import getHelmReleaseInjectable from "./get-helm-release.injectable";
+import writeFileInjectable from "../../../common/fs/write-file.injectable";
+import removePathInjectable from "../../../common/fs/remove-path.injectable";
+import execHelmInjectable from "../exec-helm/exec-helm.injectable";
 
 export interface UpdateChartArgs {
   chart: string;
-  values: JsonObject;
+  values: string;
   version: string;
 }
 
@@ -24,40 +23,42 @@ const updateHelmReleaseInjectable = getInjectable({
   instantiate: (di) => {
     const logger = di.inject(loggerInjectable);
     const getHelmRelease = di.inject(getHelmReleaseInjectable);
+    const writeFile = di.inject(writeFileInjectable);
+    const removePath = di.inject(removePathInjectable);
+    const execHelm = di.inject(execHelmInjectable);
 
     return async (cluster: Cluster, releaseName: string, namespace: string, data: UpdateChartArgs) => {
       const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
-
-      logger.debug("Upgrade release");
-
       const valuesFilePath = tempy.file({ name: "values.yaml" });
 
-      await fse.writeFile(valuesFilePath, yaml.dump(data.values));
-
-      const args = [
-        "upgrade",
-        releaseName,
-        data.chart,
-        "--version", data.version,
-        "--values", valuesFilePath,
-        "--namespace", namespace,
-        "--kubeconfig", proxyKubeconfig,
-      ];
+      logger.debug(`[HELM]: upgrading "${releaseName}" in "${namespace}" to ${data.version}`);
 
       try {
-        const output = await execHelm(args);
+        await writeFile(valuesFilePath, data.values);
+
+        const result = await execHelm([
+          "upgrade",
+          releaseName,
+          data.chart,
+          "--version", data.version,
+          "--values", valuesFilePath,
+          "--namespace", namespace,
+          "--kubeconfig", proxyKubeconfig,
+        ]);
+
+        if (result.callWasSuccessful === false) {
+          throw result.error; // keep the same interface
+        }
 
         return {
-          log: output,
+          log: result.response,
           release: await getHelmRelease(cluster, releaseName, namespace),
         };
       } finally {
-        await fse.unlink(valuesFilePath);
+        await removePath(valuesFilePath);
       }
     };
   },
-
-  causesSideEffects: true,
 });
 
 export default updateHelmReleaseInjectable;
diff --git a/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts b/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts
index f4effd1a62..1c68bf6fd7 100644
--- a/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts
+++ b/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts
@@ -2,25 +2,13 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import addHelmRepositoryChannelInjectable from "../../../../common/helm/add-helm-repository-channel.injectable";
+import { addHelmRepositoryChannel } from "../../../../common/helm/add-helm-repository-channel";
+import { getRequestChannelListenerInjectable } from "../../../utils/channel/channel-listeners/listener-tokens";
 import addHelmRepositoryInjectable from "./add-helm-repository.injectable";
-import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
 
-const addHelmRepositoryChannelListenerInjectable = getInjectable({
-  id: "add-helm-repository-channel-listener",
-
-  instantiate: (di) => {
-    const addHelmRepository = di.inject(addHelmRepositoryInjectable);
-    const channel = di.inject(addHelmRepositoryChannelInjectable);
-
-    return {
-      channel,
-      handler: addHelmRepository,
-    };
-  },
-
-  injectionToken: requestChannelListenerInjectionToken,
+const addHelmRepositoryChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: addHelmRepositoryChannel,
+  handler: (di) => di.inject(addHelmRepositoryInjectable),
 });
 
 export default addHelmRepositoryChannelListenerInjectable;
diff --git a/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts b/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts
index 73283884c3..5292f8a662 100644
--- a/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts
+++ b/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts
@@ -4,17 +4,18 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import execHelmInjectable from "../../exec-helm/exec-helm.injectable";
-import type { HelmRepo } from "../../../../common/helm/helm-repo";
 import loggerInjectable from "../../../../common/logger.injectable";
+import type { AddHelmRepositoryChannel } from "../../../../common/helm/add-helm-repository-channel";
+import type { RequestChannelHandler } from "../../../utils/channel/channel-listeners/listener-tokens";
 
 const addHelmRepositoryInjectable = getInjectable({
   id: "add-helm-repository",
 
-  instantiate: (di) => {
+  instantiate: (di): RequestChannelHandler<AddHelmRepositoryChannel> => {
     const execHelm = di.inject(execHelmInjectable);
     const logger = di.inject(loggerInjectable);
 
-    return async (repo: HelmRepo) => {
+    return async (repo) => {
       const {
         name,
         url,
@@ -54,7 +55,18 @@ const addHelmRepositoryInjectable = getInjectable({
         args.push("--cert-file", certFile);
       }
 
-      return await execHelm(args);
+      const result = await execHelm(args);
+
+      if (result.callWasSuccessful) {
+        return {
+          callWasSuccessful: true,
+        };
+      }
+
+      return {
+        callWasSuccessful: false,
+        error: result.error.stderr || result.error.message,
+      };
     };
   },
 });
diff --git a/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories-channel-listener.injectable.ts b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories-channel-listener.injectable.ts
index e48ec7665e..5ef0f2b5a4 100644
--- a/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories-channel-listener.injectable.ts
+++ b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories-channel-listener.injectable.ts
@@ -2,25 +2,13 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
-import getActiveHelmRepositoriesChannelInjectable from "../../../../common/helm/get-active-helm-repositories-channel.injectable";
+import { getActiveHelmRepositoriesChannel } from "../../../../common/helm/get-active-helm-repositories-channel";
+import { getRequestChannelListenerInjectable } from "../../../utils/channel/channel-listeners/listener-tokens";
 import getActiveHelmRepositoriesInjectable from "./get-active-helm-repositories.injectable";
 
-const getActiveHelmRepositoriesChannelListenerInjectable = getInjectable({
-  id: "get-active-helm-repositories-channel-listener",
-
-  instantiate: (di) => {
-    const getActiveHelmRepositories = di.inject(getActiveHelmRepositoriesInjectable);
-
-    return {
-      channel: di.inject(getActiveHelmRepositoriesChannelInjectable),
-
-      handler: getActiveHelmRepositories,
-    };
-  },
-
-  injectionToken: requestChannelListenerInjectionToken,
+const getActiveHelmRepositoriesChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: getActiveHelmRepositoriesChannel,
+  handler: (di) => di.inject(getActiveHelmRepositoriesInjectable),
 });
 
 export default getActiveHelmRepositoriesChannelListenerInjectable;
diff --git a/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts
index c4fb86451b..bd05b950d7 100644
--- a/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts
+++ b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts
@@ -78,10 +78,10 @@ const getActiveHelmRepositoriesInjectable = getInjectable({
       const updateResult = await execHelm(["repo", "update"]);
 
       if (!updateResult.callWasSuccessful) {
-        if (!updateResult.error.includes(internalHelmErrorForNoRepositoriesFound)) {
+        if (!updateResult.error.stderr.includes(internalHelmErrorForNoRepositoriesFound)) {
           return {
             callWasSuccessful: false,
-            error: `Error updating Helm repositories: ${updateResult.error}`,
+            error: `Error updating Helm repositories: ${updateResult.error.stderr}`,
           };
         }
         const resultOfAddingDefaultRepository = await execHelm(["repo", "add", "bitnami", "https://charts.bitnami.com/bitnami"]);
@@ -89,7 +89,7 @@ const getActiveHelmRepositoriesInjectable = getInjectable({
         if (!resultOfAddingDefaultRepository.callWasSuccessful) {
           return {
             callWasSuccessful: false,
-            error: `Error when adding default Helm repository: ${resultOfAddingDefaultRepository.error}`,
+            error: `Error when adding default Helm repository: ${resultOfAddingDefaultRepository.error.stderr}`,
           };
         }
       }
diff --git a/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts
index b9b2f11777..8a4e04b87c 100644
--- a/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts
+++ b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts
@@ -2,25 +2,13 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
 import removeHelmRepositoryInjectable from "./remove-helm-repository.injectable";
-import removeHelmRepositoryChannelInjectable from "../../../../common/helm/remove-helm-repository-channel.injectable";
+import { removeHelmRepositoryChannel } from "../../../../common/helm/remove-helm-repository-channel";
+import { getRequestChannelListenerInjectable } from "../../../utils/channel/channel-listeners/listener-tokens";
 
-const removeHelmRepositoryChannelListenerInjectable = getInjectable({
-  id: "remove-helm-repository-channel-listener",
-
-  instantiate: (di) => {
-    const removeHelmRepository = di.inject(removeHelmRepositoryInjectable);
-    const channel = di.inject(removeHelmRepositoryChannelInjectable);
-
-    return {
-      channel,
-      handler: removeHelmRepository,
-    };
-  },
-
-  injectionToken: requestChannelListenerInjectionToken,
+const removeHelmRepositoryChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: removeHelmRepositoryChannel,
+  handler: (di) => di.inject(removeHelmRepositoryInjectable),
 });
 
 export default removeHelmRepositoryChannelListenerInjectable;
diff --git a/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts
index c858667f6a..a662603a96 100644
--- a/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts
+++ b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import execHelmInjectable from "../../exec-helm/exec-helm.injectable";
 import type { HelmRepo } from "../../../../common/helm/helm-repo";
 import loggerInjectable from "../../../../common/logger.injectable";
+import type { AsyncResult } from "../../../../common/utils/async-result";
 
 const removeHelmRepositoryInjectable = getInjectable({
   id: "remove-helm-repository",
@@ -14,14 +15,25 @@ const removeHelmRepositoryInjectable = getInjectable({
     const execHelm = di.inject(execHelmInjectable);
     const logger = di.inject(loggerInjectable);
 
-    return async (repo: HelmRepo) => {
+    return async (repo: HelmRepo): Promise<AsyncResult<void, string>> => {
       logger.info(`[HELM]: removing repo ${repo.name} (${repo.url})`);
 
-      return execHelm([
+      const result = await execHelm([
         "repo",
         "remove",
         repo.name,
       ]);
+
+      if (result.callWasSuccessful) {
+        return {
+          callWasSuccessful: true,
+        };
+      }
+
+      return {
+        callWasSuccessful: false,
+        error: result.error.stderr,
+      };
     };
   },
 });
diff --git a/src/main/index.ts b/src/main/index.ts
index 8a95ad02db..b44341324f 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -6,19 +6,15 @@
 // Main process
 
 import * as Mobx from "mobx";
+import { spawn } from "node-pty";
 import * as LensExtensionsCommonApi from "../extensions/common-api";
 import * as LensExtensionsMainApi from "../extensions/main-api";
 import { getDi } from "./getDi";
 import startMainApplicationInjectable from "./start-main-application/start-main-application.injectable";
-import shouldStartHiddenInjectable from "./electron-app/features/should-start-hidden.injectable";
 
 const di = getDi();
 
-const shouldStartHidden = di.inject(shouldStartHiddenInjectable);
-
-const startApplication = di.inject(startMainApplicationInjectable);
-
-void startApplication(!shouldStartHidden);
+void di.inject(startMainApplicationInjectable);
 
 /**
  * Exports for virtual package "@k8slens/extensions" for main-process.
@@ -30,4 +26,8 @@ const LensExtensions = {
   Main: LensExtensionsMainApi,
 };
 
-export { Mobx, LensExtensions };
+const Pty = {
+  spawn,
+};
+
+export { Mobx, LensExtensions, Pty };
diff --git a/src/main/k8s/api-base.injectable.ts b/src/main/k8s/api-base.injectable.ts
new file mode 100644
index 0000000000..07a9424993
--- /dev/null
+++ b/src/main/k8s/api-base.injectable.ts
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { apiBaseInjectionToken } from "../../common/k8s-api/api-base";
+import createJsonApiInjectable from "../../common/k8s-api/create-json-api.injectable";
+import { apiPrefix } from "../../common/vars";
+import isDebuggingInjectable from "../../common/vars/is-debugging.injectable";
+import isDevelopmentInjectable from "../../common/vars/is-development.injectable";
+import lensProxyPortInjectable from "../lens-proxy/lens-proxy-port.injectable";
+
+const apiBaseInjectable = getInjectable({
+  id: "api-base",
+  instantiate: (di) => {
+    const proxyPort = di.inject(lensProxyPortInjectable);
+    const createJsonApi = di.inject(createJsonApiInjectable);
+    const isDebugging = di.inject(isDebuggingInjectable);
+
+    return createJsonApi({
+      serverAddress: `http://127.0.0.1:${proxyPort.get()}`,
+      apiBase: apiPrefix,
+      debug: di.inject(isDevelopmentInjectable) || isDebugging,
+    }, {
+      headers: {
+        "Host": `localhost:${proxyPort.get()}`,
+      },
+    });
+  },
+  injectionToken: apiBaseInjectionToken,
+});
+
+export default apiBaseInjectable;
diff --git a/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts b/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts
index 67cfd8c26e..ba64b69c69 100644
--- a/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts
+++ b/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts
@@ -6,14 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable";
 import type { KubeAuthProxyDependencies } from "./kube-auth-proxy";
 import { KubeAuthProxy } from "./kube-auth-proxy";
 import type { Cluster } from "../../common/cluster/cluster";
-import path from "path";
-import selfsigned from "selfsigned";
-import { getBinaryName } from "../../common/vars";
 import spawnInjectable from "../child-process/spawn.injectable";
-import { getKubeAuthProxyCertificate } from "./get-kube-auth-proxy-certificate";
+import kubeAuthProxyCertificateInjectable from "./kube-auth-proxy-certificate.injectable";
 import loggerInjectable from "../../common/logger.injectable";
-import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
 import waitUntilPortIsUsedInjectable from "./wait-until-port-is-used/wait-until-port-is-used.injectable";
+import lensK8sProxyPathInjectable from "./lens-k8s-proxy-path.injectable";
 
 export type CreateKubeAuthProxy = (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => KubeAuthProxy;
 
@@ -21,19 +18,20 @@ const createKubeAuthProxyInjectable = getInjectable({
   id: "create-kube-auth-proxy",
 
   instantiate: (di): CreateKubeAuthProxy => {
-    const binaryName = getBinaryName("lens-k8s-proxy");
+    const dependencies: Omit<KubeAuthProxyDependencies, "proxyCert"> = {
+      proxyBinPath: di.inject(lensK8sProxyPathInjectable),
+      spawn: di.inject(spawnInjectable),
+      logger: di.inject(loggerInjectable),
+      waitUntilPortIsUsed: di.inject(waitUntilPortIsUsedInjectable),
+    };
 
     return (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => {
       const clusterUrl = new URL(cluster.apiUrl);
-      const dependencies: KubeAuthProxyDependencies = {
-        proxyBinPath: path.join(di.inject(baseBundledBinariesDirectoryInjectable), binaryName),
-        proxyCert: getKubeAuthProxyCertificate(clusterUrl.hostname, selfsigned.generate),
-        spawn: di.inject(spawnInjectable),
-        logger: di.inject(loggerInjectable),
-        waitUntilPortIsUsed: di.inject(waitUntilPortIsUsedInjectable),
-      };
 
-      return new KubeAuthProxy(dependencies, cluster, environmentVariables);
+      return new KubeAuthProxy({
+        ...dependencies,
+        proxyCert: di.inject(kubeAuthProxyCertificateInjectable, clusterUrl.hostname),
+      }, cluster, environmentVariables);
     };
   },
 });
diff --git a/src/main/kube-auth-proxy/get-kube-auth-proxy-certificate.ts b/src/main/kube-auth-proxy/kube-auth-proxy-certificate.injectable.ts
similarity index 60%
rename from src/main/kube-auth-proxy/get-kube-auth-proxy-certificate.ts
rename to src/main/kube-auth-proxy/kube-auth-proxy-certificate.injectable.ts
index f6fa71702c..35358f1e52 100644
--- a/src/main/kube-auth-proxy/get-kube-auth-proxy-certificate.ts
+++ b/src/main/kube-auth-proxy/kube-auth-proxy-certificate.injectable.ts
@@ -3,15 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type * as selfsigned from "selfsigned";
-import { getOrInsertWith } from "../../common/utils";
+import { generate } from "selfsigned";
+import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
 
-type SelfSignedGenerate = typeof selfsigned.generate;
-
-const certCache = new Map<string, selfsigned.SelfSignedCert>();
-
-export function getKubeAuthProxyCertificate(hostname: string, generate: SelfSignedGenerate): selfsigned.SelfSignedCert {
-  return getOrInsertWith(certCache, hostname, () => generate(
+const kubeAuthProxyCertificateInjectable = getInjectable({
+  id: "kube-auth-proxy-certificate",
+  instantiate: (di, hostname) => generate(
     [
       { name: "commonName", value: "Lens Certificate Authority" },
       { name: "organizationName", value: "Lens" },
@@ -31,5 +28,11 @@ export function getKubeAuthProxyCertificate(hostname: string, generate: SelfSign
         },
       ],
     },
-  ));
-}
+  ),
+  lifecycle: lifecycleEnum.keyedSingleton({
+    getInstanceKey: (di, hostname: string) => hostname,
+  }),
+});
+
+export default kubeAuthProxyCertificateInjectable;
+
diff --git a/src/main/kube-auth-proxy/lens-k8s-proxy-path.injectable.ts b/src/main/kube-auth-proxy/lens-k8s-proxy-path.injectable.ts
new file mode 100644
index 0000000000..cd13bdcf5e
--- /dev/null
+++ b/src/main/kube-auth-proxy/lens-k8s-proxy-path.injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import bundledBinaryPathInjectable from "../../common/utils/bundled-binary-path.injectable";
+
+const lensK8sProxyPathInjectable = getInjectable({
+  id: "lens-k8s-proxy-path",
+  instantiate: (di) => di.inject(bundledBinaryPathInjectable, "lens-k8s-proxy"),
+});
+
+export default lensK8sProxyPathInjectable;
diff --git a/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts b/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts
index e1f365f098..ed75943398 100644
--- a/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts
+++ b/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts
@@ -9,6 +9,11 @@ import type { KubeconfigManagerDependencies } from "./kubeconfig-manager";
 import { KubeconfigManager } from "./kubeconfig-manager";
 import loggerInjectable from "../../common/logger.injectable";
 import lensProxyPortInjectable from "../lens-proxy/lens-proxy-port.injectable";
+import joinPathsInjectable from "../../common/path/join-paths.injectable";
+import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable";
+import deleteFileInjectable from "../../common/fs/delete-file.injectable";
+import pathExistsInjectable from "../../common/fs/path-exists.injectable";
+import writeFileInjectable from "../../common/fs/write-file.injectable";
 
 export interface KubeConfigManagerInstantiationParameter {
   cluster: Cluster;
@@ -24,6 +29,11 @@ const createKubeconfigManagerInjectable = getInjectable({
       directoryForTemp: di.inject(directoryForTempInjectable),
       logger: di.inject(loggerInjectable),
       lensProxyPort: di.inject(lensProxyPortInjectable),
+      joinPaths: di.inject(joinPathsInjectable),
+      getDirnameOfPath: di.inject(getDirnameOfPathInjectable),
+      deleteFile: di.inject(deleteFileInjectable),
+      pathExists: di.inject(pathExistsInjectable),
+      writeFile: di.inject(writeFileInjectable),
     };
 
     return (cluster) => new KubeconfigManager(dependencies, cluster);
diff --git a/src/main/kubeconfig-manager/kubeconfig-manager.ts b/src/main/kubeconfig-manager/kubeconfig-manager.ts
index d7a9794a0f..a51599169e 100644
--- a/src/main/kubeconfig-manager/kubeconfig-manager.ts
+++ b/src/main/kubeconfig-manager/kubeconfig-manager.ts
@@ -6,17 +6,25 @@
 import type { KubeConfig } from "@kubernetes/client-node";
 import type { Cluster } from "../../common/cluster/cluster";
 import type { ClusterContextHandler } from "../context-handler/context-handler";
-import path from "path";
-import fs from "fs-extra";
 import { dumpConfigYaml } from "../../common/kube-helpers";
 import { isErrnoException } from "../../common/utils";
 import type { PartialDeep } from "type-fest";
 import type { Logger } from "../../common/logger";
+import type { JoinPaths } from "../../common/path/join-paths.injectable";
+import type { GetDirnameOfPath } from "../../common/path/get-dirname.injectable";
+import type { PathExists } from "../../common/fs/path-exists.injectable";
+import type { DeleteFile } from "../../common/fs/delete-file.injectable";
+import type { WriteFile } from "../../common/fs/write-file.injectable";
 
 export interface KubeconfigManagerDependencies {
   readonly directoryForTemp: string;
   readonly logger: Logger;
-  lensProxyPort: { get: () => number };
+  readonly lensProxyPort: { get: () => number };
+  joinPaths: JoinPaths;
+  getDirnameOfPath: GetDirnameOfPath;
+  pathExists: PathExists;
+  deleteFile: DeleteFile;
+  writeFile: WriteFile;
 }
 
 export class KubeconfigManager {
@@ -24,10 +32,9 @@ export class KubeconfigManager {
    * The path to the temp config file
    *
    * - if `string` then path
-   * - if `null` then not yet created
-   * - if `undefined` then unlinked by calling `clear()`
+   * - if `null` then not yet created or was cleared
    */
-  protected tempFilePath: string | null | undefined = null;
+  protected tempFilePath: string | null = null;
 
   protected readonly contextHandler: ClusterContextHandler;
 
@@ -40,11 +47,7 @@ export class KubeconfigManager {
    * @returns The path to the temporary kubeconfig
    */
   async getPath(): Promise<string> {
-    if (this.tempFilePath === undefined) {
-      throw new Error("kubeconfig is already unlinked");
-    }
-
-    if (this.tempFilePath === null || !(await fs.pathExists(this.tempFilePath))) {
+    if (this.tempFilePath === null || !(await this.dependencies.pathExists(this.tempFilePath))) {
       return await this.ensureFile();
     }
 
@@ -62,13 +65,13 @@ export class KubeconfigManager {
     this.dependencies.logger.info(`[KUBECONFIG-MANAGER]: Deleting temporary kubeconfig: ${this.tempFilePath}`);
 
     try {
-      await fs.unlink(this.tempFilePath);
+      await this.dependencies.deleteFile(this.tempFilePath);
     } catch (error) {
       if (isErrnoException(error) && error.code !== "ENOENT") {
         throw error;
       }
     } finally {
-      this.tempFilePath = undefined;
+      this.tempFilePath = null;
     }
   }
 
@@ -78,7 +81,7 @@ export class KubeconfigManager {
 
       return this.tempFilePath = await this.createProxyKubeconfig();
     } catch (error) {
-      throw Object.assign(new Error("Failed to creat temp config for auth-proxy"), { cause: error });
+      throw new Error(`Failed to creat temp config for auth-proxy: ${error}`);
     }
   }
 
@@ -93,7 +96,7 @@ export class KubeconfigManager {
   protected async createProxyKubeconfig(): Promise<string> {
     const { cluster } = this;
     const { contextName, id } = cluster;
-    const tempFile = path.join(
+    const tempFile = this.dependencies.joinPaths(
       this.dependencies.directoryForTemp,
       `kubeconfig-${id}`,
     );
@@ -121,8 +124,7 @@ export class KubeconfigManager {
     // write
     const configYaml = dumpConfigYaml(proxyConfig);
 
-    await fs.ensureDir(path.dirname(tempFile));
-    await fs.writeFile(tempFile, configYaml, { mode: 0o600 });
+    await this.dependencies.writeFile(tempFile, configYaml, { mode: 0o600 });
     this.dependencies.logger.debug(`[KUBECONFIG-MANAGER]: Created temp kubeconfig "${contextName}" at "${tempFile}": \n${configYaml}`);
 
     return tempFile;
diff --git a/src/main/kubectl/apply-all-handler.injectable.ts b/src/main/kubectl/apply-all-handler.injectable.ts
new file mode 100644
index 0000000000..ca9d13577b
--- /dev/null
+++ b/src/main/kubectl/apply-all-handler.injectable.ts
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import emitAppEventInjectable from "../../common/app-event-bus/emit-event.injectable";
+import getClusterByIdInjectable from "../../common/cluster-store/get-by-id.injectable";
+import { kubectlApplyAllChannel } from "../../common/kube-helpers/channels";
+import createResourceApplierInjectable from "../resource-applier/create-resource-applier.injectable";
+import { getRequestChannelListenerInjectable } from "../utils/channel/channel-listeners/listener-tokens";
+
+const kubectlApplyAllChannelHandlerInjectable = getRequestChannelListenerInjectable({
+  channel: kubectlApplyAllChannel,
+  handler: (di) => {
+    const getClusterById = di.inject(getClusterByIdInjectable);
+    const emitAppEvent = di.inject(emitAppEventInjectable);
+    const createResourceApplier = di.inject(createResourceApplierInjectable);
+
+    return async ({
+      clusterId,
+      extraArgs,
+      resources,
+    }) => {
+      emitAppEvent({ name: "cluster", action: "kubectl-apply-all" });
+      const cluster = getClusterById(clusterId);
+
+      if (!cluster) {
+        return {
+          callWasSuccessful: false,
+          error: `No cluster found for clusterId="${clusterId}"`,
+        };
+      }
+
+      return createResourceApplier(cluster).kubectlApplyAll(resources, extraArgs);
+    };
+  },
+});
+
+export default kubectlApplyAllChannelHandlerInjectable;
diff --git a/src/main/kubectl/binary-name.injectable.ts b/src/main/kubectl/binary-name.injectable.ts
index 66b42a6007..f21cabd76e 100644
--- a/src/main/kubectl/binary-name.injectable.ts
+++ b/src/main/kubectl/binary-name.injectable.ts
@@ -3,17 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
+import binaryNameInjectable from "../../common/utils/binary-name.injectable";
 
 const kubectlBinaryNameInjectable = getInjectable({
   id: "kubectl-binary-name",
-  instantiate: (di) => {
-    const platform = di.inject(normalizedPlatformInjectable);
-
-    return platform === "windows"
-      ? "kubectl.exe"
-      : "kubectl";
-  },
+  instantiate: (di) => di.inject(binaryNameInjectable, "kubectl"),
 });
 
 export default kubectlBinaryNameInjectable;
diff --git a/src/main/kubectl/bundled-binary-path.injectable.ts b/src/main/kubectl/bundled-binary-path.injectable.ts
index df5ee63c04..bad89af5f6 100644
--- a/src/main/kubectl/bundled-binary-path.injectable.ts
+++ b/src/main/kubectl/bundled-binary-path.injectable.ts
@@ -3,16 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import path from "path";
-import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
-import kubectlBinaryNameInjectable from "./binary-name.injectable";
+import bundledBinaryPathInjectable from "../../common/utils/bundled-binary-path.injectable";
 
 const bundledKubectlBinaryPathInjectable = getInjectable({
   id: "bundled-kubectl-binary-path",
-  instantiate: (di) => path.join(
-    di.inject(baseBundledBinariesDirectoryInjectable),
-    di.inject(kubectlBinaryNameInjectable),
-  ),
+  instantiate: (di) => di.inject(bundledBinaryPathInjectable, "kubectl"),
 });
 
 export default bundledKubectlBinaryPathInjectable;
diff --git a/src/main/kubectl/bundled-kubectl.injectable.ts b/src/main/kubectl/bundled-kubectl.injectable.ts
index a06cbedff9..e7ecb7c7f8 100644
--- a/src/main/kubectl/bundled-kubectl.injectable.ts
+++ b/src/main/kubectl/bundled-kubectl.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { getBundledKubectlVersion } from "../../common/utils";
+import bundledKubectlVersionInjectable from "../../common/vars/bundled-kubectl-version.injectable";
 import createKubectlInjectable from "./create-kubectl.injectable";
 
 const bundledKubectlInjectable = getInjectable({
@@ -11,8 +11,7 @@ const bundledKubectlInjectable = getInjectable({
 
   instantiate: (di) => {
     const createKubectl = di.inject(createKubectlInjectable);
-
-    const bundledKubectlVersion = getBundledKubectlVersion();
+    const bundledKubectlVersion = di.inject(bundledKubectlVersionInjectable);
 
     return createKubectl(bundledKubectlVersion);
   },
diff --git a/src/main/kubectl/create-kubectl.injectable.ts b/src/main/kubectl/create-kubectl.injectable.ts
index 1e13b7d02c..f5a278ab7b 100644
--- a/src/main/kubectl/create-kubectl.injectable.ts
+++ b/src/main/kubectl/create-kubectl.injectable.ts
@@ -12,6 +12,11 @@ import normalizedPlatformInjectable from "../../common/vars/normalized-platform.
 import kubectlBinaryNameInjectable from "./binary-name.injectable";
 import bundledKubectlBinaryPathInjectable from "./bundled-binary-path.injectable";
 import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
+import bundledKubectlVersionInjectable from "../../common/vars/bundled-kubectl-version.injectable";
+import kubectlVersionMapInjectable from "./version-map.injectable";
+import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable";
+import joinPathsInjectable from "../../common/path/join-paths.injectable";
+import getBasenameOfPathInjectable from "../../common/path/get-basename.injectable";
 
 const createKubectlInjectable = getInjectable({
   id: "create-kubectl",
@@ -25,6 +30,11 @@ const createKubectlInjectable = getInjectable({
       kubectlBinaryName: di.inject(kubectlBinaryNameInjectable),
       bundledKubectlBinaryPath: di.inject(bundledKubectlBinaryPathInjectable),
       baseBundeledBinariesDirectory: di.inject(baseBundledBinariesDirectoryInjectable),
+      bundledKubectlVersion: di.inject(bundledKubectlVersionInjectable),
+      kubectlVersionMap: di.inject(kubectlVersionMapInjectable),
+      getDirnameOfPath: di.inject(getDirnameOfPathInjectable),
+      joinPaths: di.inject(joinPathsInjectable),
+      getBasenameOfPath: di.inject(getBasenameOfPathInjectable),
     };
 
     return (clusterVersion: string) => new Kubectl(dependencies, clusterVersion);
diff --git a/src/main/kubectl/delete-all-handler.injectable.ts b/src/main/kubectl/delete-all-handler.injectable.ts
new file mode 100644
index 0000000000..00a8db6707
--- /dev/null
+++ b/src/main/kubectl/delete-all-handler.injectable.ts
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import emitAppEventInjectable from "../../common/app-event-bus/emit-event.injectable";
+import getClusterByIdInjectable from "../../common/cluster-store/get-by-id.injectable";
+import { kubectlDeleteAllChannel } from "../../common/kube-helpers/channels";
+import createResourceApplierInjectable from "../resource-applier/create-resource-applier.injectable";
+import { getRequestChannelListenerInjectable } from "../utils/channel/channel-listeners/listener-tokens";
+
+const kubectlDeleteAllChannelHandlerInjectable = getRequestChannelListenerInjectable({
+  channel: kubectlDeleteAllChannel,
+  handler: (di) => {
+    const emitAppEvent = di.inject(emitAppEventInjectable);
+    const getClusterById = di.inject(getClusterByIdInjectable);
+    const createResourceApplier = di.inject(createResourceApplierInjectable);
+
+    return async ({
+      clusterId,
+      extraArgs,
+      resources,
+    }) => {
+      emitAppEvent({ name: "cluster", action: "kubectl-delete-all" });
+
+      const cluster = getClusterById(clusterId);
+
+      if (!cluster) {
+        return {
+          callWasSuccessful: false,
+          error: `No cluster found for clusterId="${clusterId}"`,
+        };
+      }
+
+      return createResourceApplier(cluster).kubectlDeleteAll(resources, extraArgs);
+    };
+  },
+});
+
+export default kubectlDeleteAllChannelHandlerInjectable;
diff --git a/src/main/kubectl/kubectl-apply-all.injectable.ts b/src/main/kubectl/kubectl-apply-all.injectable.ts
new file mode 100644
index 0000000000..f65dd78c9b
--- /dev/null
+++ b/src/main/kubectl/kubectl-apply-all.injectable.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { kubectlApplyAllInjectionToken } from "../../common/kube-helpers/channels";
+import kubectlApplyAllChannelHandlerInjectable from "./apply-all-handler.injectable";
+
+const kubectlApplyAllInjectable = getInjectable({
+  id: "kubectl-apply-all",
+  instantiate: (di) => {
+    const channelHandler = di.inject(kubectlApplyAllChannelHandlerInjectable);
+
+    return async (req) => channelHandler.handler(req);
+  },
+  injectionToken: kubectlApplyAllInjectionToken,
+});
+
+export default kubectlApplyAllInjectable;
diff --git a/src/main/kubectl/kubectl-delete-all.injectable.ts b/src/main/kubectl/kubectl-delete-all.injectable.ts
new file mode 100644
index 0000000000..e97342b84f
--- /dev/null
+++ b/src/main/kubectl/kubectl-delete-all.injectable.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { kubectlDeleteAllInjectionToken } from "../../common/kube-helpers/channels";
+import kubectlDeleteAllChannelHandlerInjectable from "./delete-all-handler.injectable";
+
+const kubectlDeleteAllInjectable = getInjectable({
+  id: "kubectl-delete-all",
+  instantiate: (di) => {
+    const channel = di.inject(kubectlDeleteAllChannelHandlerInjectable);
+
+    return async (req) => channel.handler(req);
+  },
+  injectionToken: kubectlDeleteAllInjectionToken,
+});
+
+export default kubectlDeleteAllInjectable;
diff --git a/src/main/kubectl/kubectl.ts b/src/main/kubectl/kubectl.ts
index 2e70f3c7ee..f0b3c45da0 100644
--- a/src/main/kubectl/kubectl.ts
+++ b/src/main/kubectl/kubectl.ts
@@ -3,45 +3,27 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import path from "path";
 import fs from "fs";
 import { promiseExecFile } from "../../common/utils/promise-exec";
 import logger from "../logger";
 import { ensureDir, pathExists } from "fs-extra";
 import * as lockFile from "proper-lockfile";
-import { getBundledKubectlVersion } from "../../common/utils/app-version";
-import { SemVer } from "semver";
+import { SemVer, coerce } from "semver";
 import { defaultPackageMirror, packageMirrors } from "../../common/user-store/preferences-helpers";
 import got from "got/dist/source";
 import { promisify } from "util";
 import stream from "stream";
 import { noop } from "lodash/fp";
+import type { JoinPaths } from "../../common/path/join-paths.injectable";
+import type { GetDirnameOfPath } from "../../common/path/get-dirname.injectable";
+import type { GetBasenameOfPath } from "../../common/path/get-basename.injectable";
+import type { NormalizedPlatform } from "../../common/vars/normalized-platform.injectable";
 
-const bundledVersion = getBundledKubectlVersion();
-const kubectlMap: Map<string, string> = new Map([
-  ["1.7", "1.8.15"],
-  ["1.8", "1.9.10"],
-  ["1.9", "1.10.13"],
-  ["1.10", "1.11.10"],
-  ["1.11", "1.12.10"],
-  ["1.12", "1.13.12"],
-  ["1.13", "1.13.12"],
-  ["1.14", "1.14.10"],
-  ["1.15", "1.15.11"],
-  ["1.16", "1.16.15"],
-  ["1.17", "1.17.17"],
-  ["1.18", "1.18.20"],
-  ["1.19", "1.19.12"],
-  ["1.20", "1.20.8"],
-  ["1.21", "1.21.9"],
-  ["1.22", "1.22.6"],
-  ["1.23", bundledVersion],
-]);
 const initScriptVersionString = "# lens-initscript v3";
 
 export interface KubectlDependencies {
   readonly directoryForKubectlBinaries: string;
-  readonly normalizedDownloadPlatform: "darwin" | "linux" | "windows";
+  readonly normalizedDownloadPlatform: NormalizedPlatform;
   readonly normalizedDownloadArch: "amd64" | "arm64" | "386";
   readonly kubectlBinaryName: string;
   readonly bundledKubectlBinaryPath: string;
@@ -52,6 +34,11 @@ export interface KubectlDependencies {
     readonly downloadKubectlBinaries: boolean;
     readonly downloadMirror: string;
   };
+  readonly bundledKubectlVersion: string;
+  readonly kubectlVersionMap: Map<string, string>;
+  joinPaths: JoinPaths;
+  getDirnameOfPath: GetDirnameOfPath;
+  getBasenameOfPath: GetBasenameOfPath;
 }
 
 export class Kubectl {
@@ -60,19 +47,19 @@ export class Kubectl {
   protected readonly path: string;
   protected readonly dirname: string;
 
-  public static readonly bundledKubectlVersion = bundledVersion;
   public static invalidBundle = false;
 
   constructor(protected readonly dependencies: KubectlDependencies, clusterVersion: string) {
     let version: SemVer;
+    const bundledVersion = new SemVer(this.dependencies.bundledKubectlVersion);
 
     try {
       version = new SemVer(clusterVersion);
     } catch {
-      version = new SemVer(Kubectl.bundledKubectlVersion);
+      version = bundledVersion;
     }
 
-    const fromMajorMinor = kubectlMap.get(`${version.major}.${version.minor}`);
+    const fromMajorMinor = this.dependencies.kubectlVersionMap.get(`${version.major}.${version.minor}`);
 
     /**
      * minorVersion is the first two digits of kube server version if the version map includes that,
@@ -82,13 +69,16 @@ export class Kubectl {
       this.kubectlVersion = fromMajorMinor;
       logger.debug(`Set kubectl version ${this.kubectlVersion} for cluster version ${clusterVersion} using version map`);
     } else {
-      this.kubectlVersion = version.format();
+      /* this is the version (without possible prelease tag) to get from the download mirror */
+      const ver = coerce(version.format()) ?? bundledVersion;
+
+      this.kubectlVersion = ver.format();
       logger.debug(`Set kubectl version ${this.kubectlVersion} for cluster version ${clusterVersion} using fallback`);
     }
 
     this.url = `${this.getDownloadMirror()}/v${this.kubectlVersion}/bin/${this.dependencies.normalizedDownloadPlatform}/${this.dependencies.normalizedDownloadArch}/${this.dependencies.kubectlBinaryName}`;
-    this.dirname = path.normalize(path.join(this.getDownloadDir(), this.kubectlVersion));
-    this.path = path.join(this.dirname, this.dependencies.kubectlBinaryName);
+    this.dirname = this.dependencies.joinPaths(this.getDownloadDir(), this.kubectlVersion);
+    this.path = this.dependencies.joinPaths(this.dirname, this.dependencies.kubectlBinaryName);
   }
 
   public getBundledPath() {
@@ -101,7 +91,7 @@ export class Kubectl {
 
   protected getDownloadDir() {
     if (this.dependencies.userStore.downloadBinariesPath) {
-      return path.join(this.dependencies.userStore.downloadBinariesPath, "kubectl");
+      return this.dependencies.joinPaths(this.dependencies.userStore.downloadBinariesPath, "kubectl");
     }
 
     return this.dependencies.directoryForKubectlBinaries;
@@ -120,7 +110,7 @@ export class Kubectl {
     if (!await this.checkBinary(this.getBundledPath(), false)) {
       Kubectl.invalidBundle = true;
 
-      return path.basename(this.getBundledPath());
+      return this.dependencies.getBasenameOfPath(this.getBundledPath());
     }
 
     try {
@@ -189,7 +179,7 @@ export class Kubectl {
   }
 
   protected async checkBundled(): Promise<boolean> {
-    if (this.kubectlVersion === Kubectl.bundledKubectlVersion) {
+    if (this.kubectlVersion === this.dependencies.bundledKubectlVersion) {
       try {
         const exist = await pathExists(this.path);
 
@@ -262,7 +252,7 @@ export class Kubectl {
   }
 
   public async downloadKubectl() {
-    await ensureDir(path.dirname(this.path), 0o755);
+    await ensureDir(this.dependencies.getDirnameOfPath(this.path), 0o755);
 
     logger.info(`Downloading kubectl ${this.kubectlVersion} from ${this.url} to ${this.path}`);
 
@@ -284,9 +274,9 @@ export class Kubectl {
     const binariesDir = this.dependencies.baseBundeledBinariesDirectory;
     const kubectlPath = this.dependencies.userStore.downloadKubectlBinaries
       ? this.dirname
-      : path.dirname(this.getPathFromPreferences());
+      : this.dependencies.getDirnameOfPath(this.getPathFromPreferences());
 
-    const bashScriptPath = path.join(this.dirname, ".bash_set_path");
+    const bashScriptPath = this.dependencies.joinPaths(this.dirname, ".bash_set_path");
     const bashScript = [
       initScriptVersionString,
       "tempkubeconfig=\"$KUBECONFIG\"",
@@ -308,7 +298,7 @@ export class Kubectl {
       "unset tempkubeconfig",
     ].join("\n");
 
-    const zshScriptPath = path.join(this.dirname, ".zlogin");
+    const zshScriptPath = this.dependencies.joinPaths(this.dirname, ".zlogin");
     const zshScript = [
       initScriptVersionString,
       "tempkubeconfig=\"$KUBECONFIG\"",
diff --git a/src/main/kubectl/version-map.injectable.ts b/src/main/kubectl/version-map.injectable.ts
new file mode 100644
index 0000000000..2beee76e0c
--- /dev/null
+++ b/src/main/kubectl/version-map.injectable.ts
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import bundledKubectlVersionInjectable from "../../common/vars/bundled-kubectl-version.injectable";
+
+const kubectlVersionMapInjectable = getInjectable({
+  id: "kubectl-version-map",
+  instantiate: (di) => {
+    const bundledKubectlVersion = di.inject(bundledKubectlVersionInjectable);
+
+    return new Map([
+      ["1.7", "1.8.15"],
+      ["1.8", "1.9.10"],
+      ["1.9", "1.10.13"],
+      ["1.10", "1.11.10"],
+      ["1.11", "1.12.10"],
+      ["1.12", "1.13.12"],
+      ["1.13", "1.13.12"],
+      ["1.14", "1.14.10"],
+      ["1.15", "1.15.11"],
+      ["1.16", "1.16.15"],
+      ["1.17", "1.17.17"],
+      ["1.18", "1.18.20"],
+      ["1.19", "1.19.12"],
+      ["1.20", "1.20.8"],
+      ["1.21", "1.21.9"],
+      ["1.22", "1.22.6"],
+      ["1.23", bundledKubectlVersion],
+    ]);
+  },
+});
+
+export default kubectlVersionMapInjectable;
diff --git a/src/main/lens-proxy/lens-proxy.injectable.ts b/src/main/lens-proxy/lens-proxy.injectable.ts
index 34cb327339..1c6444ccaa 100644
--- a/src/main/lens-proxy/lens-proxy.injectable.ts
+++ b/src/main/lens-proxy/lens-proxy.injectable.ts
@@ -7,29 +7,27 @@ import { LensProxy } from "./lens-proxy";
 import { kubeApiUpgradeRequest } from "./proxy-functions";
 import routerInjectable from "../router/router.injectable";
 import httpProxy from "http-proxy";
-import clusterManagerInjectable from "../cluster-manager.injectable";
+import clusterManagerInjectable from "../cluster/manager.injectable";
 import shellApiRequestInjectable from "./proxy-functions/shell-api-request/shell-api-request.injectable";
 import lensProxyPortInjectable from "./lens-proxy-port.injectable";
+import contentSecurityPolicyInjectable from "../../common/vars/content-security-policy.injectable";
+import emitAppEventInjectable from "../../common/app-event-bus/emit-event.injectable";
+import loggerInjectable from "../../common/logger.injectable";
 
 const lensProxyInjectable = getInjectable({
   id: "lens-proxy",
 
-  instantiate: (di) => {
-    const clusterManager = di.inject(clusterManagerInjectable);
-    const router = di.inject(routerInjectable);
-    const shellApiRequest = di.inject(shellApiRequestInjectable);
-    const proxy = httpProxy.createProxy();
-    const lensProxyPort = di.inject(lensProxyPortInjectable);
-
-    return new LensProxy({
-      router,
-      proxy,
-      kubeApiUpgradeRequest,
-      shellApiRequest,
-      getClusterForRequest: clusterManager.getClusterForRequest,
-      lensProxyPort,
-    });
-  },
+  instantiate: (di) => new LensProxy({
+    router: di.inject(routerInjectable),
+    proxy: httpProxy.createProxy(),
+    kubeApiUpgradeRequest,
+    shellApiRequest: di.inject(shellApiRequestInjectable),
+    getClusterForRequest: di.inject(clusterManagerInjectable).getClusterForRequest,
+    lensProxyPort: di.inject(lensProxyPortInjectable),
+    contentSecurityPolicy: di.inject(contentSecurityPolicyInjectable),
+    emitAppEvent: di.inject(emitAppEventInjectable),
+    logger: di.inject(loggerInjectable),
+  }),
 });
 
 export default lensProxyInjectable;
diff --git a/src/main/lens-proxy/lens-proxy.ts b/src/main/lens-proxy/lens-proxy.ts
index 5e58104d60..5dc2794299 100644
--- a/src/main/lens-proxy/lens-proxy.ts
+++ b/src/main/lens-proxy/lens-proxy.ts
@@ -4,19 +4,18 @@
  */
 
 import net from "net";
-import type http from "http";
-import spdy from "spdy";
+import http from "http";
 import type httpProxy from "http-proxy";
-import { apiPrefix, apiKubePrefix, contentSecurityPolicy } from "../../common/vars";
+import { apiPrefix, apiKubePrefix } from "../../common/vars";
 import type { Router } from "../router/router";
 import type { ClusterContextHandler } from "../context-handler/context-handler";
-import logger from "../logger";
 import type { Cluster } from "../../common/cluster/cluster";
 import type { ProxyApiRequestArgs } from "./proxy-functions";
-import { appEventBus } from "../../common/app-event-bus/event-bus";
 import { getBoolean } from "../utils/parse-query";
 import assert from "assert";
 import type { SetRequired } from "type-fest";
+import type { EmitAppEvent } from "../../common/app-event-bus/emit-event.injectable";
+import type { Logger } from "../../common/logger";
 
 type GetClusterForRequest = (req: http.IncomingMessage) => Cluster | undefined;
 
@@ -26,9 +25,12 @@ interface Dependencies {
   getClusterForRequest: GetClusterForRequest;
   shellApiRequest: (args: ProxyApiRequestArgs) => void | Promise<void>;
   kubeApiUpgradeRequest: (args: ProxyApiRequestArgs) => void | Promise<void>;
-  router: Router;
-  proxy: httpProxy;
-  lensProxyPort: { set: (portNumber: number) => void };
+  emitAppEvent: EmitAppEvent;
+  readonly router: Router;
+  readonly proxy: httpProxy;
+  readonly lensProxyPort: { set: (portNumber: number) => void };
+  readonly contentSecurityPolicy: string;
+  readonly logger: Logger;
 }
 
 const watchParam = "watch";
@@ -63,15 +65,10 @@ export class LensProxy {
   protected closed = false;
   protected retryCounters = new Map<string, number>();
 
-  constructor(private dependencies: Dependencies) {
+  constructor(private readonly dependencies: Dependencies) {
     this.configureProxy(dependencies.proxy);
 
-    this.proxyServer = spdy.createServer({
-      spdy: {
-        plain: true,
-        protocols: ["http/1.1", "spdy/3.1"],
-      },
-    }, (req, res) => {
+    this.proxyServer = http.createServer((req, res) => {
       this.handleRequest(req as ServerIncomingMessage, res);
     });
 
@@ -80,14 +77,14 @@ export class LensProxy {
         const cluster = dependencies.getClusterForRequest(req);
 
         if (!cluster) {
-          logger.error(`[LENS-PROXY]: Could not find cluster for upgrade request from url=${req.url}`);
+          this.dependencies.logger.error(`[LENS-PROXY]: Could not find cluster for upgrade request from url=${req.url}`);
           socket.destroy();
         } else {
           const isInternal = req.url.startsWith(`${apiPrefix}?`);
           const reqHandler = isInternal ? dependencies.shellApiRequest : dependencies.kubeApiUpgradeRequest;
 
           (async () => reqHandler({ req, socket, head, cluster }))()
-            .catch(error => logger.error("[LENS-PROXY]: failed to handle proxy upgrade", error));
+            .catch(error => this.dependencies.logger.error("[LENS-PROXY]: failed to handle proxy upgrade", error));
         }
       });
   }
@@ -110,17 +107,17 @@ export class LensProxy {
 
           this.dependencies.lensProxyPort.set(port);
 
-          logger.info(`[LENS-PROXY]: Proxy server has started at ${address}:${port}`);
+          this.dependencies.logger.info(`[LENS-PROXY]: Proxy server has started at ${address}:${port}`);
 
           this.proxyServer.on("error", (error) => {
-            logger.info(`[LENS-PROXY]: Subsequent error: ${error}`);
+            this.dependencies.logger.info(`[LENS-PROXY]: Subsequent error: ${error}`);
           });
 
-          appEventBus.emit({ name: "lens-proxy", action: "listen", params: { port }});
+          this.dependencies.emitAppEvent({ name: "lens-proxy", action: "listen", params: { port }});
           resolve(port);
         })
         .once("error", (error) => {
-          logger.info(`[LENS-PROXY]: Proxy server failed to start: ${error}`);
+          this.dependencies.logger.info(`[LENS-PROXY]: Proxy server failed to start: ${error}`);
           reject(error);
         });
     });
@@ -143,7 +140,7 @@ export class LensProxy {
         return;
       }
 
-      logger.warn(`[LENS-PROXY]: Proxy server has with port known to be considered unsafe to connect to by chrome, restarting...`);
+      this.dependencies.logger.warn(`[LENS-PROXY]: Proxy server has with port known to be considered unsafe to connect to by chrome, restarting...`);
 
       if (seenPorts.has(port)) {
         /**
@@ -159,7 +156,7 @@ export class LensProxy {
   }
 
   close() {
-    logger.info("[LENS-PROXY]: Closing server");
+    this.dependencies.logger.info("[LENS-PROXY]: Closing server");
     this.proxyServer.close();
     this.closed = true;
   }
@@ -182,10 +179,10 @@ export class LensProxy {
         return;
       }
 
-      logger.error(`[LENS-PROXY]: http proxy errored for cluster: ${error}`, { url: req.url });
+      this.dependencies.logger.error(`[LENS-PROXY]: http proxy errored for cluster: ${error}`, { url: req.url });
 
       if (target) {
-        logger.debug(`Failed proxy to target: ${JSON.stringify(target, null, 2)}`);
+        this.dependencies.logger.debug(`Failed proxy to target: ${JSON.stringify(target, null, 2)}`);
 
         if (req.method === "GET" && (!res.statusCode || res.statusCode >= 500)) {
           const reqId = this.getRequestId(req);
@@ -193,11 +190,11 @@ export class LensProxy {
           const timeoutMs = retryCount * 250;
 
           if (retryCount < 20) {
-            logger.debug(`Retrying proxy request to url: ${reqId}`);
+            this.dependencies.logger.debug(`Retrying proxy request to url: ${reqId}`);
             setTimeout(() => {
               this.retryCounters.set(reqId, retryCount + 1);
               this.handleRequest(req as ServerIncomingMessage, res)
-                .catch(error => logger.error(`[LENS-PROXY]: failed to handle request on proxy error: ${error}`));
+                .catch(error => this.dependencies.logger.error(`[LENS-PROXY]: failed to handle request on proxy error: ${error}`));
             }, timeoutMs);
           }
         }
@@ -206,7 +203,7 @@ export class LensProxy {
       try {
         res.writeHead(500).end(`Oops, something went wrong.\n${error}`);
       } catch (e) {
-        logger.error(`[LENS-PROXY]: Failed to write headers: `, e);
+        this.dependencies.logger.error(`[LENS-PROXY]: Failed to write headers: `, e);
       }
     });
 
@@ -239,10 +236,7 @@ export class LensProxy {
       }
     }
 
-    if (contentSecurityPolicy) {
-      res.setHeader("Content-Security-Policy", contentSecurityPolicy);
-    }
-
-    this.dependencies.router.route(cluster, req, res);
+    res.setHeader("Content-Security-Policy", this.dependencies.contentSecurityPolicy);
+    await this.dependencies.router.route(cluster, req, res);
   }
 }
diff --git a/src/main/lens-proxy/proxy-functions/shell-api-request/shell-api-request.injectable.ts b/src/main/lens-proxy/proxy-functions/shell-api-request/shell-api-request.injectable.ts
index b491ab5456..550a8d2560 100644
--- a/src/main/lens-proxy/proxy-functions/shell-api-request/shell-api-request.injectable.ts
+++ b/src/main/lens-proxy/proxy-functions/shell-api-request/shell-api-request.injectable.ts
@@ -4,15 +4,15 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { shellApiRequest } from "./shell-api-request";
-import createShellSessionInjectable from "../../../shell-session/create-shell-session.injectable";
 import shellRequestAuthenticatorInjectable from "./shell-request-authenticator/shell-request-authenticator.injectable";
-import clusterManagerInjectable from "../../../cluster-manager.injectable";
+import clusterManagerInjectable from "../../../cluster/manager.injectable";
+import openShellSessionInjectable from "../../../shell-session/create-shell-session.injectable";
 
 const shellApiRequestInjectable = getInjectable({
   id: "shell-api-request",
 
   instantiate: (di) => shellApiRequest({
-    createShellSession: di.inject(createShellSessionInjectable),
+    openShellSession: di.inject(openShellSessionInjectable),
     authenticateRequest: di.inject(shellRequestAuthenticatorInjectable).authenticate,
     clusterManager: di.inject(clusterManagerInjectable),
   }),
diff --git a/src/main/lens-proxy/proxy-functions/shell-api-request/shell-api-request.ts b/src/main/lens-proxy/proxy-functions/shell-api-request/shell-api-request.ts
index 97b6dedd4c..f4492e96f6 100644
--- a/src/main/lens-proxy/proxy-functions/shell-api-request/shell-api-request.ts
+++ b/src/main/lens-proxy/proxy-functions/shell-api-request/shell-api-request.ts
@@ -4,28 +4,20 @@
  */
 
 import logger from "../../../logger";
-import type WebSocket from "ws";
 import { Server as WebSocketServer } from "ws";
 import type { ProxyApiRequestArgs } from "../types";
-import type { ClusterManager } from "../../../cluster-manager";
+import type { ClusterManager } from "../../../cluster/manager";
 import URLParse from "url-parse";
-import type { Cluster } from "../../../../common/cluster/cluster";
 import type { ClusterId } from "../../../../common/cluster-types";
+import type { OpenShellSession } from "../../../shell-session/create-shell-session.injectable";
 
 interface Dependencies {
   authenticateRequest: (clusterId: ClusterId, tabId: string, shellToken: string | undefined) => boolean;
-
-  createShellSession: (args: {
-    webSocket: WebSocket;
-    cluster: Cluster;
-    tabId: string;
-    nodeName?: string;
-  }) => { open: () => Promise<void> };
-
+  openShellSession: OpenShellSession;
   clusterManager: ClusterManager;
 }
 
-export const shellApiRequest = ({ createShellSession, authenticateRequest, clusterManager }: Dependencies) => ({ req, socket, head }: ProxyApiRequestArgs): void => {
+export const shellApiRequest = ({ openShellSession, authenticateRequest, clusterManager }: Dependencies) => ({ req, socket, head }: ProxyApiRequestArgs): void => {
   const cluster = clusterManager.getClusterForRequest(req);
   const { query: { node: nodeName, shellToken, id: tabId }} = new URLParse(req.url, true);
 
@@ -37,10 +29,8 @@ export const shellApiRequest = ({ createShellSession, authenticateRequest, clust
 
   const ws = new WebSocketServer({ noServer: true });
 
-  ws.handleUpgrade(req, socket, head, (webSocket) => {
-    const shell = createShellSession({ webSocket, cluster, tabId, nodeName });
-
-    shell.open()
+  ws.handleUpgrade(req, socket, head, (websocket) => {
+    openShellSession({ websocket, cluster, tabId, nodeName })
       .catch(error => logger.error(`[SHELL-SESSION]: failed to open a ${nodeName ? "node" : "local"} shell`, error));
   });
 };
diff --git a/src/main/logger/console-format.ts b/src/main/logger/console-format.ts
new file mode 100644
index 0000000000..909b244aa0
--- /dev/null
+++ b/src/main/logger/console-format.ts
@@ -0,0 +1,184 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { LEVEL, MESSAGE, SPLAT } from "triple-beam";
+import chalk from "chalk";
+import type { InspectOptions } from "util";
+import { inspect } from "util";
+
+// The following license was copied from https://github.com/duccio/winston-console-format/blob/master/LICENSE
+// This was modified to support formatting causes
+
+/*
+The MIT License (MIT)
+
+Copyright (c) 2014-2015 Eugeny Dementev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+export interface ConsoleFormatOptions {
+  showMeta?: boolean;
+  metaStrip?: string[];
+  inspectOptions?: InspectOptions;
+}
+
+interface TransformableInfo {
+  level: string;
+  message: string;
+  [key: string | symbol]: any;
+}
+
+export class ConsoleFormat {
+  private static readonly reSpaces = /^\s+/;
+  private static readonly reSpacesOrEmpty = /^(\s*)/;
+  // eslint-disable-next-line no-control-regex
+  private static readonly reColor = /\x1B\[\d+m/;
+  private static readonly defaultStrip = [LEVEL, MESSAGE, SPLAT, "level", "message", "ms", "stack"];
+  private static readonly chars = {
+    singleLine: "▪",
+    startLine: "┏",
+    line: "┃",
+    endLine: "┗",
+  };
+
+  private readonly showMeta: boolean;
+  private readonly metaStrip: string[];
+  private readonly inspectOptions: InspectOptions;
+
+  public constructor(opts?: ConsoleFormatOptions) {
+    this.showMeta = opts?.showMeta ?? true;
+    this.metaStrip = opts?.metaStrip ?? [];
+    this.inspectOptions = opts?.inspectOptions ?? {};
+  }
+
+  private getLines(value: unknown): string[] {
+    return inspect(value, this.inspectOptions).split("\n");
+  }
+
+  private message(info: TransformableInfo, chr: string, color: string): string {
+    const message = info.message.replace(
+      ConsoleFormat.reSpacesOrEmpty,
+      `$1${color}${chalk.dim(chr)}${chalk.reset(" ")}`,
+    );
+
+    return `${info.level}:${message}`;
+  }
+
+  private pad(message?: string): string {
+    return message?.match(ConsoleFormat.reSpaces)?.[0] ?? "";
+  }
+
+  private ms(info: TransformableInfo): string {
+    if (info.ms) {
+      return chalk.italic(chalk.dim(` ${info.ms}`));
+    }
+
+    return "";
+  }
+
+  private stack(info: TransformableInfo): string[] {
+    const messages: string[] = [];
+
+    if (info.stack) {
+      const error = new Error();
+
+      error.stack = info.stack;
+      messages.push(...this.getLines(error));
+    }
+
+    return messages;
+  }
+
+  private _cause(source: unknown): string[] {
+    const messages: string[] = [];
+
+    if (source instanceof Error && source.cause) {
+      messages.push(`Cause: ${source.cause}`);
+      messages.push(...this.getLines(source.cause).map(l => `    ${l}`));
+      messages.push(...this._cause(source.cause));
+    }
+
+    return messages;
+  }
+
+  private cause(info: TransformableInfo): string[] {
+    const splats = info[SPLAT];
+
+    if (Array.isArray(splats)) {
+      return splats.flatMap(splat => this._cause(splat));
+    }
+
+    return [];
+  }
+
+  private meta(info: TransformableInfo): string[] {
+    const messages: string[] = [];
+    const stripped = { ...info };
+
+    ConsoleFormat.defaultStrip.forEach((e) => delete stripped[e]);
+    this.metaStrip?.forEach((e) => delete stripped[e]);
+
+    if (Object.keys(stripped).length > 0) {
+      messages.push(...this.getLines(stripped));
+    }
+
+    return messages;
+  }
+
+  private getColor(info: TransformableInfo): string {
+    return info.level.match(ConsoleFormat.reColor)?.[0] ?? "";
+  }
+
+  private write(info: TransformableInfo, messages: string[], color: string): void {
+    const pad = this.pad(info.message);
+
+    messages.forEach((line, index, arr) => {
+      const lineNumber = chalk.dim(`[${(index + 1).toString().padStart(arr.length.toString().length, " ")}]`);
+      let chr = ConsoleFormat.chars.line;
+
+      if (index === arr.length - 1) {
+        chr = ConsoleFormat.chars.endLine;
+      }
+      info[MESSAGE] += `\n${chalk.dim(info.level)}:${pad}${color}${chalk.dim(chr)}${chalk.reset(" ")}`;
+      info[MESSAGE] += `${lineNumber} ${line}`;
+    });
+  }
+
+  public transform(info: TransformableInfo): TransformableInfo {
+    const messages: string[] = [];
+
+    if (this.showMeta) {
+      messages.push(...this.stack(info));
+      messages.push(...this.meta(info));
+      messages.push(...this.cause(info));
+    }
+
+    const color = this.getColor(info);
+
+    info[MESSAGE] = this.message(info, ConsoleFormat.chars[messages.length > 0 ? "startLine" : "singleLine"], color);
+    info[MESSAGE] += this.ms(info);
+
+    this.write(info, messages, color);
+
+    return info;
+  }
+}
diff --git a/src/main/logger/console-transport.injectable.ts b/src/main/logger/console-transport.injectable.ts
new file mode 100644
index 0000000000..8200eafe2a
--- /dev/null
+++ b/src/main/logger/console-transport.injectable.ts
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { format, transports } from "winston";
+import { ConsoleFormat } from "./console-format";
+import { loggerTransportInjectionToken } from "../../common/logger/transports";
+import logLevelInjectable from "./level.injectable";
+
+const consoleLoggerTransportInjectable = getInjectable({
+  id: "console-logger-transport",
+  instantiate: (di) => new transports.Console({
+    handleExceptions: false,
+    level: di.inject(logLevelInjectable),
+    format: format.combine(
+      format.colorize({ level: true, message: false }),
+      format.padLevels(),
+      format.ms(),
+      new ConsoleFormat({
+        showMeta: true,
+        inspectOptions: {
+          depth: 4,
+          colors: true,
+          maxArrayLength: 10,
+          breakLength: 120,
+          compact: Infinity,
+        },
+      }),
+    ),
+  }),
+  injectionToken: loggerTransportInjectionToken,
+});
+
+export default consoleLoggerTransportInjectable;
diff --git a/src/main/logger/file-transport.injectable.ts b/src/main/logger/file-transport.injectable.ts
new file mode 100644
index 0000000000..2f1eab5c0c
--- /dev/null
+++ b/src/main/logger/file-transport.injectable.ts
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { transports } from "winston";
+import directoryForLogsInjectable from "../../common/app-paths/directory-for-logs.injectable";
+import { loggerTransportInjectionToken } from "../../common/logger/transports";
+
+const fileLoggerTranportInjectable = getInjectable({
+  id: "file-logger-tranport",
+  instantiate: (di) => new transports.File({
+    handleExceptions: false,
+    level: "debug",
+    filename: "lens.log",
+    /**
+         * SAFTEY: the `ipcMain` check above should mean that this is only
+         * called in the main process
+         */
+    dirname: di.inject(directoryForLogsInjectable),
+    maxsize: 1024 * 1024,
+    maxFiles: 16,
+    tailable: true,
+  }),
+  injectionToken: loggerTransportInjectionToken,
+});
+
+export default fileLoggerTranportInjectable;
diff --git a/src/main/menu/build-version.global-override-for-injectable.ts b/src/main/logger/level.global-override-for-injectable.ts
similarity index 62%
rename from src/main/menu/build-version.global-override-for-injectable.ts
rename to src/main/logger/level.global-override-for-injectable.ts
index 9c2331f72d..ac29c9ee1a 100644
--- a/src/main/menu/build-version.global-override-for-injectable.ts
+++ b/src/main/logger/level.global-override-for-injectable.ts
@@ -4,6 +4,6 @@
  */
 
 import { getGlobalOverride } from "../../common/test-utils/get-global-override";
-import buildVersionInjectable from "./build-version.injectable";
+import logLevelInjectable from "./level.injectable";
 
-export default getGlobalOverride(buildVersionInjectable, () => "6.0.0");
+export default getGlobalOverride(logLevelInjectable, () => "error");
diff --git a/src/main/logger/level.injectable.ts b/src/main/logger/level.injectable.ts
new file mode 100644
index 0000000000..7ee1b9d587
--- /dev/null
+++ b/src/main/logger/level.injectable.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import isDebuggingInjectable from "../../common/vars/is-debugging.injectable";
+
+export type LogLevel = "silly" | "debug" | "info" | "warn" | "error";
+
+const logLevelInjectable = getInjectable({
+  id: "log-level",
+  instantiate: (di): LogLevel => {
+    const isDebugging = di.inject(isDebuggingInjectable);
+    const baseLevel = process.env.LOG_LEVEL?.toLowerCase();
+
+    switch (baseLevel) {
+      case "silly":
+      case "debug":
+      case "info":
+      case "warn":
+      case "error":
+        return baseLevel;
+      default:
+        return isDebugging ? "debug" : "info";
+    }
+  },
+  causesSideEffects: true,
+});
+
+export default logLevelInjectable;
diff --git a/src/main/menu/application-menu-items.injectable.ts b/src/main/menu/application-menu-items.injectable.ts
deleted file mode 100644
index 34d0955d77..0000000000
--- a/src/main/menu/application-menu-items.injectable.ts
+++ /dev/null
@@ -1,331 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { docsUrl, productName, supportUrl } from "../../common/vars";
-import { broadcastMessage } from "../../common/ipc";
-import type { MenuItemConstructorOptions } from "electron";
-import { webContents } from "electron";
-import loggerInjectable from "../../common/logger.injectable";
-import appNameInjectable from "../app-paths/app-name/app-name.injectable";
-import electronMenuItemsInjectable from "./electron-menu-items.injectable";
-import updatingIsEnabledInjectable from "../application-update/updating-is-enabled.injectable";
-import navigateToPreferencesInjectable from "../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable";
-import navigateToExtensionsInjectable from "../../common/front-end-routing/routes/extensions/navigate-to-extensions.injectable";
-import navigateToCatalogInjectable from "../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
-import navigateToWelcomeInjectable from "../../common/front-end-routing/routes/welcome/navigate-to-welcome.injectable";
-import navigateToAddClusterInjectable from "../../common/front-end-routing/routes/add-cluster/navigate-to-add-cluster.injectable";
-import stopServicesAndExitAppInjectable from "../stop-services-and-exit-app.injectable";
-import isMacInjectable from "../../common/vars/is-mac.injectable";
-import { computed } from "mobx";
-import showAboutInjectable from "./show-about.injectable";
-import reloadCurrentApplicationWindowInjectable from "../start-main-application/lens-window/reload-current-application-window.injectable";
-import showApplicationWindowInjectable from "../start-main-application/lens-window/show-application-window.injectable";
-import processCheckingForUpdatesInjectable from "../application-update/check-for-updates/process-checking-for-updates.injectable";
-import openLinkInBrowserInjectable from "../../common/utils/open-link-in-browser.injectable";
-
-function ignoreIf(check: boolean, menuItems: MenuItemOpts[]) {
-  return check ? [] : menuItems;
-}
-
-export interface MenuItemOpts extends MenuItemConstructorOptions {
-  submenu?: MenuItemConstructorOptions[];
-}
-
-const applicationMenuItemsInjectable = getInjectable({
-  id: "application-menu-items",
-
-  instantiate: (di) => {
-    const logger = di.inject(loggerInjectable);
-    const appName = di.inject(appNameInjectable);
-    const isMac = di.inject(isMacInjectable);
-    const updatingIsEnabled = di.inject(updatingIsEnabledInjectable);
-    const electronMenuItems = di.inject(electronMenuItemsInjectable);
-    const showAbout = di.inject(showAboutInjectable);
-    const showApplicationWindow = di.inject(showApplicationWindowInjectable);
-    const reloadApplicationWindow = di.inject(reloadCurrentApplicationWindowInjectable);
-    const navigateToPreferences = di.inject(navigateToPreferencesInjectable);
-    const navigateToExtensions = di.inject(navigateToExtensionsInjectable);
-    const navigateToCatalog = di.inject(navigateToCatalogInjectable);
-    const navigateToWelcome = di.inject(navigateToWelcomeInjectable);
-    const navigateToAddCluster = di.inject(navigateToAddClusterInjectable);
-    const stopServicesAndExitApp = di.inject(stopServicesAndExitAppInjectable);
-    const processCheckingForUpdates = di.inject(processCheckingForUpdatesInjectable);
-    const openLinkInBrowser = di.inject(openLinkInBrowserInjectable);
-
-    logger.info(`[MENU]: autoUpdateEnabled=${updatingIsEnabled}`);
-
-    return computed((): MenuItemOpts[] => {
-      const macAppMenu: MenuItemOpts = {
-        label: appName,
-        id: "root",
-        submenu: [
-          {
-            label: `About ${productName}`,
-            id: "about",
-            click() {
-              showAbout();
-            },
-          },
-          ...ignoreIf(!updatingIsEnabled, [
-            {
-              id: "check-for-updates",
-              label: "Check for updates",
-              click() {
-                processCheckingForUpdates("application-menu").then(() => showApplicationWindow());
-              },
-            },
-          ]),
-          { type: "separator" },
-          {
-            label: "Preferences",
-            accelerator: "CmdOrCtrl+,",
-            id: "preferences",
-            click() {
-              navigateToPreferences();
-            },
-          },
-          {
-            label: "Extensions",
-            accelerator: "CmdOrCtrl+Shift+E",
-            id: "extensions",
-            click() {
-              navigateToExtensions();
-            },
-          },
-          { type: "separator" },
-          { role: "services" },
-          { type: "separator" },
-          { role: "hide" },
-          { role: "hideOthers" },
-          { role: "unhide" },
-          { type: "separator" },
-          {
-            label: "Quit",
-            accelerator: "Cmd+Q",
-            id: "quit",
-            click() {
-              stopServicesAndExitApp();
-            },
-          },
-        ],
-      };
-      const fileMenu: MenuItemOpts = {
-        label: "File",
-        id: "file",
-        submenu: [
-          {
-            label: "Add Cluster",
-            accelerator: "CmdOrCtrl+Shift+A",
-            id: "add-cluster",
-            click() {
-              navigateToAddCluster();
-            },
-          },
-          ...ignoreIf(isMac, [
-            { type: "separator" },
-            {
-              label: "Preferences",
-              id: "preferences",
-              accelerator: "Ctrl+,",
-              click() {
-                navigateToPreferences();
-              },
-            },
-            {
-              label: "Extensions",
-              accelerator: "Ctrl+Shift+E",
-              click() {
-                navigateToExtensions();
-              },
-            },
-          ]),
-          { type: "separator" },
-          ...ignoreIf(!isMac, [
-            {
-              role: "close",
-              label: "Close Window",
-              accelerator: "Shift+Cmd+W",
-            },
-          ]),
-          ...ignoreIf(isMac, [
-            {
-              label: "Exit",
-              accelerator: "Alt+F4",
-              id: "quit",
-              click() {
-                stopServicesAndExitApp();
-              },
-            },
-          ]),
-        ],
-      };
-      const editMenu: MenuItemOpts = {
-        label: "Edit",
-        id: "edit",
-        submenu: [
-          { role: "undo" },
-          { role: "redo" },
-          { type: "separator" },
-          { role: "cut" },
-          { role: "copy" },
-          { role: "paste" },
-          { role: "delete" },
-          { type: "separator" },
-          { role: "selectAll" },
-        ],
-      };
-      const viewMenu: MenuItemOpts = {
-        label: "View",
-        id: "view",
-        submenu: [
-          {
-            label: "Catalog",
-            accelerator: "Shift+CmdOrCtrl+C",
-            id: "catalog",
-            click() {
-              navigateToCatalog();
-            },
-          },
-          {
-            label: "Command Palette...",
-            accelerator: "Shift+CmdOrCtrl+P",
-            id: "command-palette",
-            click(_m, _b, event) {
-              /**
-               * Don't broadcast unless it was triggered by menu iteration so that
-               * there aren't double events in renderer
-               *
-               * NOTE: this `?` is required because of a bug in playwright. https://github.com/microsoft/playwright/issues/10554
-               */
-              if (!event?.triggeredByAccelerator) {
-                broadcastMessage("command-palette:open");
-              }
-            },
-          },
-          { type: "separator" },
-          {
-            label: "Back",
-            accelerator: "CmdOrCtrl+[",
-            id: "go-back",
-            click() {
-              webContents
-                .getAllWebContents()
-                .filter((wc) => wc.getType() === "window")
-                .forEach((wc) => wc.goBack());
-            },
-          },
-          {
-            label: "Forward",
-            accelerator: "CmdOrCtrl+]",
-            id: "go-forward",
-            click() {
-              webContents
-                .getAllWebContents()
-                .filter((wc) => wc.getType() === "window")
-                .forEach((wc) => wc.goForward());
-            },
-          },
-          {
-            label: "Reload",
-            accelerator: "CmdOrCtrl+R",
-            id: "reload",
-            click() {
-              reloadApplicationWindow();
-            },
-          },
-          { role: "toggleDevTools" },
-          { type: "separator" },
-          { role: "resetZoom" },
-          { role: "zoomIn" },
-          { role: "zoomOut" },
-          { type: "separator" },
-          { role: "togglefullscreen" },
-        ],
-      };
-      const helpMenu: MenuItemOpts = {
-        role: "help",
-        id: "help",
-        submenu: [
-          {
-            label: "Welcome",
-            id: "welcome",
-            click() {
-              navigateToWelcome();
-            },
-          },
-          {
-            label: "Documentation",
-            id: "documentation",
-            click: async () => {
-              openLinkInBrowser(docsUrl).catch((error) => {
-                logger.error("[MENU]: failed to open browser", { error });
-              });
-            },
-          },
-          {
-            label: "Support",
-            id: "support",
-            click: async () => {
-              openLinkInBrowser(supportUrl).catch((error) => {
-                logger.error("[MENU]: failed to open browser", { error });
-              });
-            },
-          },
-          ...ignoreIf(isMac, [
-            {
-              label: `About ${productName}`,
-              id: "about",
-              click() {
-                showAbout();
-              },
-            },
-            ...ignoreIf(!updatingIsEnabled, [
-              {
-                label: "Check for updates",
-                click() {
-                  processCheckingForUpdates("periodic").then(() =>
-                    showApplicationWindow(),
-                  );
-                },
-              },
-            ]),
-          ]),
-        ],
-      };
-      // Prepare menu items order
-      const appMenu = new Map([
-        ["mac", macAppMenu],
-        ["file", fileMenu],
-        ["edit", editMenu],
-        ["view", viewMenu],
-        ["help", helpMenu],
-      ]);
-
-      // Modify menu from extensions-api
-      for (const menuItem of electronMenuItems.get()) {
-        const parentMenu = appMenu.get(menuItem.parentId);
-
-        if (!parentMenu) {
-          logger.error(
-            `[MENU]: cannot register menu item for parentId=${menuItem.parentId}, parent item doesn't exist`,
-            { menuItem },
-          );
-
-          continue;
-        }
-
-        (parentMenu.submenu ??= []).push(menuItem);
-      }
-
-      if (!isMac) {
-        appMenu.delete("mac");
-      }
-
-      return [...appMenu.values()];
-    });
-  },
-});
-
-export default applicationMenuItemsInjectable;
diff --git a/src/main/menu/application-menu.injectable.ts b/src/main/menu/application-menu.injectable.ts
deleted file mode 100644
index 633ccedbc4..0000000000
--- a/src/main/menu/application-menu.injectable.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { autorun } from "mobx";
-import { buildMenu } from "./menu";
-import applicationMenuItemsInjectable from "./application-menu-items.injectable";
-import { getStartableStoppable } from "../../common/utils/get-startable-stoppable";
-
-const applicationMenuInjectable = getInjectable({
-  id: "application-menu",
-
-  instantiate: (di) => {
-    const applicationMenuItems = di.inject(applicationMenuItemsInjectable);
-
-    return getStartableStoppable("build-of-application-menu", () =>
-      autorun(() => buildMenu(applicationMenuItems.get()), {
-        delay: 100,
-      }),
-    );
-  },
-});
-
-export default applicationMenuInjectable;
diff --git a/src/main/menu/build-version.injectable.ts b/src/main/menu/build-version.injectable.ts
deleted file mode 100644
index d94594cc84..0000000000
--- a/src/main/menu/build-version.injectable.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import electronAppInjectable from "../electron-app/electron-app.injectable";
-
-const buildVersionInjectable = getInjectable({
-  id: "build-version",
-  instantiate: (di) => di.inject(electronAppInjectable).getVersion(),
-});
-
-export default buildVersionInjectable;
diff --git a/src/main/menu/electron-menu-items.injectable.ts b/src/main/menu/electron-menu-items.injectable.ts
deleted file mode 100644
index ff0206b734..0000000000
--- a/src/main/menu/electron-menu-items.injectable.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { computed } from "mobx";
-import mainExtensionsInjectable from "../../extensions/main-extensions.injectable";
-
-const electronMenuItemsInjectable = getInjectable({
-  id: "electron-menu-items",
-
-  instantiate: (di) => {
-    const extensions = di.inject(mainExtensionsInjectable);
-
-    return computed(() =>
-      extensions.get().flatMap((extension) => extension.appMenus));
-  },
-});
-
-export default electronMenuItemsInjectable;
diff --git a/src/main/menu/electron-menu-items.test.ts b/src/main/menu/electron-menu-items.test.ts
deleted file mode 100644
index cc47994d82..0000000000
--- a/src/main/menu/electron-menu-items.test.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import type { DiContainer } from "@ogre-tools/injectable";
-import { LensMainExtension } from "../../extensions/lens-main-extension";
-import electronMenuItemsInjectable from "./electron-menu-items.injectable";
-import type { IComputedValue } from "mobx";
-import { computed, ObservableMap, runInAction } from "mobx";
-import type { MenuRegistration } from "./menu-registration";
-import { getDiForUnitTesting } from "../getDiForUnitTesting";
-import mainExtensionsInjectable from "../../extensions/main-extensions.injectable";
-
-describe("electron-menu-items", () => {
-  let di: DiContainer;
-  let electronMenuItems: IComputedValue<MenuRegistration[]>;
-  let extensionsStub: ObservableMap<string, LensMainExtension>;
-
-  beforeEach(() => {
-    di = getDiForUnitTesting({ doGeneralOverrides: true });
-
-    extensionsStub = new ObservableMap();
-
-    di.override(
-      mainExtensionsInjectable,
-      () => computed(() => [...extensionsStub.values()]),
-    );
-
-    electronMenuItems = di.inject(electronMenuItemsInjectable);
-  });
-
-  it("does not have any items yet", () => {
-    expect(electronMenuItems.get()).toHaveLength(0);
-  });
-
-  describe("when extension is enabled", () => {
-    beforeEach(() => {
-      const someExtension = new SomeTestExtension({
-        id: "some-extension-id",
-        appMenus: [{ parentId: "some-parent-id-from-first-extension" }],
-      });
-
-      runInAction(() => {
-        extensionsStub.set("some-extension-id", someExtension);
-      });
-    });
-
-    it("has menu items", () => {
-      expect(electronMenuItems.get()).toEqual([
-        {
-          parentId: "some-parent-id-from-first-extension",
-        },
-      ]);
-    });
-
-    it("when disabling extension, does not have menu items", () => {
-      extensionsStub.delete("some-extension-id");
-
-      expect(electronMenuItems.get()).toHaveLength(0);
-    });
-
-    describe("when other extension is enabled", () => {
-      beforeEach(() => {
-        const someOtherExtension = new SomeTestExtension({
-          id: "some-extension-id",
-          appMenus: [{ parentId: "some-parent-id-from-second-extension" }],
-        });
-
-        extensionsStub.set("some-other-extension-id", someOtherExtension);
-      });
-
-      it("has menu items for both extensions", () => {
-        expect(electronMenuItems.get()).toEqual([
-          {
-            parentId: "some-parent-id-from-first-extension",
-          },
-
-          {
-            parentId: "some-parent-id-from-second-extension",
-          },
-        ]);
-      });
-
-      it("when extension is disabled, still returns menu items for extensions that are enabled", () => {
-        runInAction(() => {
-          extensionsStub.delete("some-other-extension-id");
-        });
-
-        expect(electronMenuItems.get()).toEqual([
-          {
-            parentId: "some-parent-id-from-first-extension",
-          },
-        ]);
-      });
-    });
-  });
-});
-
-class SomeTestExtension extends LensMainExtension {
-  constructor({ id, appMenus }: {
-    id: string;
-    appMenus: MenuRegistration[];
-  }) {
-    super({
-      id,
-      absolutePath: "irrelevant",
-      isBundled: false,
-      isCompatible: false,
-      isEnabled: false,
-      manifest: { name: id, version: "some-version", engines: { lens: "^5.5.0" }},
-      manifestPath: "irrelevant",
-    });
-
-    this.appMenus = appMenus;
-  }
-}
diff --git a/src/main/menu/menu.ts b/src/main/menu/menu.ts
deleted file mode 100644
index 1454f38999..0000000000
--- a/src/main/menu/menu.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { Menu } from "electron";
-import { appName, isWindows, productName } from "../../common/vars";
-import packageJson from "../../../package.json";
-import type { MenuItemOpts } from "./application-menu-items.injectable";
-import type { ShowMessagePopup } from "../electron-app/features/show-message-popup.injectable";
-
-export type MenuTopId = "mac" | "file" | "edit" | "view" | "help";
-
-interface Dependencies {
-  appVersion: string;
-  extensionApiVersion: string;
-  showMessagePopup: ShowMessagePopup;
-}
-
-export const showAbout = ({ showMessagePopup, extensionApiVersion, appVersion }: Dependencies) => async () => {
-  const appInfo = [
-    `${appName}: ${appVersion}`,
-    `Extension API: ${extensionApiVersion}`,
-    `Electron: ${process.versions.electron}`,
-    `Chrome: ${process.versions.chrome}`,
-    `Node: ${process.versions.node}`,
-    packageJson.copyright,
-  ];
-
-  await showMessagePopup(
-    `${isWindows ? " ".repeat(2) : ""}${appName}`,
-    productName,
-    appInfo.join("\r\n"),
-  );
-};
-
-export function buildMenu(applicationMenuItems: MenuItemOpts[]) {
-  Menu.setApplicationMenu(
-    Menu.buildFromTemplate(applicationMenuItems),
-  );
-}
diff --git a/src/main/menu/show-about.injectable.ts b/src/main/menu/show-about.injectable.ts
deleted file mode 100644
index b65530261d..0000000000
--- a/src/main/menu/show-about.injectable.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { showAbout } from "./menu";
-import showMessagePopupInjectable from "../electron-app/features/show-message-popup.injectable";
-import appVersionInjectable from "../../common/vars/app-version.injectable";
-import buildVersionInjectable from "./build-version.injectable";
-
-const showAboutInjectable = getInjectable({
-  id: "show-about",
-
-  instantiate: (di) =>
-    showAbout({ 
-      appVersion: di.inject(buildVersionInjectable),
-      extensionApiVersion: di.inject(appVersionInjectable),
-      showMessagePopup: di.inject(showMessagePopupInjectable),
-    }),
-});
-
-export default showAboutInjectable;
diff --git a/src/main/prometheus/get-by-kind.injectable.ts b/src/main/prometheus/get-by-kind.injectable.ts
new file mode 100644
index 0000000000..93d7567f6e
--- /dev/null
+++ b/src/main/prometheus/get-by-kind.injectable.ts
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { matches } from "lodash/fp";
+import type { PrometheusProvider } from "./provider";
+import prometheusProvidersInjectable from "./providers.injectable";
+
+export type GetPrometheusProviderByKind = (kind: string) => PrometheusProvider;
+
+const getPrometheusProviderByKindInjectable = getInjectable({
+  id: "get-prometheus-provider-by-kind",
+  instantiate: (di): GetPrometheusProviderByKind => {
+    const providers = di.inject(prometheusProvidersInjectable);
+
+    return (kind) => {
+      const provider = providers.get().find(matches({ kind }));
+
+      if (!provider) {
+        throw new Error(`Provider of kind "${kind}" does not exist`);
+      }
+
+      return provider;
+    };
+  },
+});
+
+export default getPrometheusProviderByKindInjectable;
diff --git a/src/main/prometheus/helm-14-provider.injectable.ts b/src/main/prometheus/helm-14-provider.injectable.ts
new file mode 100644
index 0000000000..6cc66c519e
--- /dev/null
+++ b/src/main/prometheus/helm-14-provider.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getLensLikeQueryFor } from "./lens-provider.injectable";
+import { createPrometheusProvider, findFirstNamespacedService, prometheusProviderInjectionToken } from "./provider";
+import { getInjectable } from "@ogre-tools/injectable";
+
+const helm14PrometheusProviderInjectable = getInjectable({
+  id: "helm14-prometheus-provider",
+  instantiate: () => createPrometheusProvider({
+    kind: "helm14",
+    name: "Helm 14.x",
+    isConfigurable: true,
+    getQuery: getLensLikeQueryFor({ rateAccuracy: "5m" }),
+    getService: (client) => findFirstNamespacedService(client, "app=prometheus,component=server,heritage=Helm"),
+  }),
+  injectionToken: prometheusProviderInjectionToken,
+});
+
+export default helm14PrometheusProviderInjectable;
+
diff --git a/src/main/prometheus/helm-14.ts b/src/main/prometheus/helm-14.ts
deleted file mode 100644
index 7ffac4560b..0000000000
--- a/src/main/prometheus/helm-14.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { PrometheusLens } from "./lens";
-import type { CoreV1Api } from "@kubernetes/client-node";
-import type { PrometheusService } from "./provider-registry";
-import { isRequestError } from "../../common/utils";
-
-export class PrometheusHelm14 extends PrometheusLens {
-  readonly id: string = "helm14";
-  readonly name: string = "Helm 14.x";
-  readonly rateAccuracy: string = "5m";
-  readonly isConfigurable: boolean = true;
-
-  public async getPrometheusService(client: CoreV1Api): Promise<PrometheusService> {
-    try {
-      const selector = "app=prometheus,component=server,heritage=Helm";
-      const { body: { items: [service] }} = await client.listServiceForAllNamespaces(undefined, undefined, undefined, selector);
-
-      if (service?.metadata?.namespace && service.metadata.name && service.spec?.ports && service.metadata?.labels?.chart?.startsWith("prometheus-14")) {
-        return {
-          id: this.id,
-          namespace: service.metadata.namespace,
-          service: service.metadata.name,
-          port: service.spec.ports[0].port,
-        };
-      }
-    } catch (error) {
-      throw new Error(`Failed to list services for Prometheus ${this.name} in all namespaces: ${isRequestError(error) ? error.response?.body.message : error}`);
-    }
-
-    throw new Error(`No service found for Prometheus ${this.name} from any namespace`);
-  }
-}
diff --git a/src/main/prometheus/helm.ts b/src/main/prometheus/helm-provider.injectable.ts
similarity index 78%
rename from src/main/prometheus/helm.ts
rename to src/main/prometheus/helm-provider.injectable.ts
index a2e80cf12e..953bd68277 100644
--- a/src/main/prometheus/helm.ts
+++ b/src/main/prometheus/helm-provider.injectable.ts
@@ -3,20 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { CoreV1Api } from "@kubernetes/client-node";
-import { inspect } from "util";
-import { PrometheusProvider, type PrometheusService } from "./provider-registry";
-export class PrometheusHelm extends PrometheusProvider {
-  readonly id: string = "helm";
-  readonly name: string = "Helm";
-  readonly rateAccuracy: string = "5m";
-  readonly isConfigurable: boolean = true;
+import type { PrometheusProvider } from "./provider";
+import { createPrometheusProvider, bytesSent, findFirstNamespacedService, prometheusProviderInjectionToken } from "./provider";
+import { getInjectable } from "@ogre-tools/injectable";
 
-  public async getPrometheusService(client: CoreV1Api): Promise<PrometheusService> {
-    return this.getFirstNamespacedService(client, "app=prometheus,component=server,heritage=Helm");
-  }
-
-  public getQuery(opts: Record<string, string>, queryName: string): string {
+export const getHelmLikeQueryFor = ({ rateAccuracy }: { rateAccuracy: string }): PrometheusProvider["getQuery"] => (
+  (opts, queryName) => {
     switch(opts.category) {
       case "cluster":
         switch (queryName) {
@@ -33,7 +25,7 @@ export class PrometheusHelm extends PrometheusProvider {
           case "memoryAllocatableCapacity":
             return `sum(kube_node_status_allocatable{node=~"${opts.nodes}", resource="memory"}) by (component)`;
           case "cpuUsage":
-            return `sum(rate(node_cpu_seconds_total{node=~"${opts.nodes}", mode=~"user|system"}[${this.rateAccuracy}]))`;
+            return `sum(rate(node_cpu_seconds_total{node=~"${opts.nodes}", mode=~"user|system"}[${rateAccuracy}]))`;
           case "cpuRequests":
             return `sum(kube_pod_container_resource_requests{node=~"${opts.nodes}", resource="cpu"}) by (component)`;
           case "cpuLimits":
@@ -65,7 +57,7 @@ export class PrometheusHelm extends PrometheusProvider {
           case "memoryAllocatableCapacity":
             return `sum(kube_node_status_allocatable{resource="memory"}) by (node)`;
           case "cpuUsage":
-            return `sum(rate(node_cpu_seconds_total{mode=~"user|system"}[${this.rateAccuracy}])) by(node)`;
+            return `sum(rate(node_cpu_seconds_total{mode=~"user|system"}[${rateAccuracy}])) by(node)`;
           case "cpuCapacity":
             return `sum(kube_node_status_allocatable{resource="cpu"}) by (node)`;
           case "cpuAllocatableCapacity":
@@ -79,7 +71,7 @@ export class PrometheusHelm extends PrometheusProvider {
       case "pods":
         switch (queryName) {
           case "cpuUsage":
-            return `sum(rate(container_cpu_usage_seconds_total{container!="POD",container!="",pod=~"${opts.pods}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_cpu_usage_seconds_total{container!="POD",container!="",pod=~"${opts.pods}",namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "cpuRequests":
             return `sum(kube_pod_container_resource_requests{pod=~"${opts.pods}",resource="cpu",namespace="${opts.namespace}"}) by (${opts.selector})`;
           case "cpuLimits":
@@ -93,13 +85,13 @@ export class PrometheusHelm extends PrometheusProvider {
           case "fsUsage":
             return `sum(container_fs_usage_bytes{container!="POD",container!="",pod=~"${opts.pods}",namespace="${opts.namespace}"}) by (${opts.selector})`;
           case "fsWrites":
-            return `sum(rate(container_fs_writes_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_fs_writes_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "fsReads":
-            return `sum(rate(container_fs_reads_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_fs_reads_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "networkReceive":
-            return `sum(rate(container_network_receive_bytes_total{pod=~"${opts.pods}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_network_receive_bytes_total{pod=~"${opts.pods}",namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "networkTransmit":
-            return `sum(rate(container_network_transmit_bytes_total{pod=~"${opts.pods}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_network_transmit_bytes_total{pod=~"${opts.pods}",namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
         }
         break;
       case "pvc":
@@ -113,17 +105,42 @@ export class PrometheusHelm extends PrometheusProvider {
       case "ingress":
         switch (queryName) {
           case "bytesSentSuccess":
-            return this.bytesSent(opts.ingress, opts.namespace, "^2\\\\d*");
+            return bytesSent({
+              rateAccuracy,
+              ingress: opts.ingress,
+              namespace: opts.namespace,
+              statuses: "^2\\\\d*",
+            });
           case "bytesSentFailure":
-            return this.bytesSent(opts.ingress, opts.namespace, "^5\\\\d*");
+            return bytesSent({
+              rateAccuracy,
+              ingress: opts.ingress,
+              namespace: opts.namespace,
+              statuses: "^5\\\\d*",
+            });
           case "requestDurationSeconds":
-            return `sum(rate(nginx_ingress_controller_request_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`;
+            return `sum(rate(nginx_ingress_controller_request_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${rateAccuracy}])) by (ingress, namespace)`;
           case "responseDurationSeconds":
-            return `sum(rate(nginx_ingress_controller_response_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`;
+            return `sum(rate(nginx_ingress_controller_response_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${rateAccuracy}])) by (ingress, namespace)`;
         }
         break;
     }
 
-    throw new Error(`Unknown query name ${inspect(queryName, false, undefined, false)} for category: ${inspect(opts.category, false, undefined, false)}`);
+    throw new Error(`Unknown queryName="${queryName}" for category="${opts.category}"`);
   }
-}
+);
+
+const helmPrometheusProviderInjectable = getInjectable({
+  id: "helm-prometheus-provider",
+  instantiate: () => createPrometheusProvider({
+    kind: "helm",
+    name: "Helm",
+    isConfigurable: true,
+    getQuery: getHelmLikeQueryFor({ rateAccuracy: "5m" }),
+    getService: (client) => findFirstNamespacedService(client, "app=prometheus,component=server,heritage=Helm"),
+  }),
+  injectionToken: prometheusProviderInjectionToken,
+});
+
+export default helmPrometheusProviderInjectable;
+
diff --git a/src/main/prometheus/lens.ts b/src/main/prometheus/lens-provider.injectable.ts
similarity index 78%
rename from src/main/prometheus/lens.ts
rename to src/main/prometheus/lens-provider.injectable.ts
index e651a0a896..c523c72582 100644
--- a/src/main/prometheus/lens.ts
+++ b/src/main/prometheus/lens-provider.injectable.ts
@@ -3,22 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { PrometheusService } from "./provider-registry";
-import { PrometheusProvider } from "./provider-registry";
-import type { CoreV1Api } from "@kubernetes/client-node";
-import { inspect } from "util";
+import { bytesSent, prometheusProviderInjectionToken, findNamespacedService, createPrometheusProvider } from "./provider";
+import type {  PrometheusProvider } from "./provider";
+import { getInjectable } from "@ogre-tools/injectable";
 
-export class PrometheusLens extends PrometheusProvider {
-  readonly id: string = "lens";
-  readonly name: string = "Lens";
-  readonly rateAccuracy: string = "1m";
-  readonly isConfigurable: boolean = false;
-
-  public getPrometheusService(client: CoreV1Api): Promise<PrometheusService> {
-    return this.getNamespacedService(client, "prometheus", "lens-metrics");
-  }
-
-  public getQuery(opts: Record<string, string>, queryName: string): string {
+export const getLensLikeQueryFor = ({ rateAccuracy }: { rateAccuracy: string }): PrometheusProvider["getQuery"] => (
+  (opts, queryName) => {
     switch(opts.category) {
       case "cluster":
         switch (queryName) {
@@ -35,7 +25,7 @@ export class PrometheusLens extends PrometheusProvider {
           case "memoryAllocatableCapacity":
             return `sum(kube_node_status_allocatable{node=~"${opts.nodes}", resource="memory"}) by (component)`;
           case "cpuUsage":
-            return `sum(rate(node_cpu_seconds_total{kubernetes_node=~"${opts.nodes}", mode=~"user|system"}[${this.rateAccuracy}]))`;
+            return `sum(rate(node_cpu_seconds_total{kubernetes_node=~"${opts.nodes}", mode=~"user|system"}[${rateAccuracy}]))`;
           case "cpuRequests":
             return `sum(kube_pod_container_resource_requests{node=~"${opts.nodes}", resource="cpu"}) by (component)`;
           case "cpuLimits":
@@ -67,7 +57,7 @@ export class PrometheusLens extends PrometheusProvider {
           case "memoryAllocatableCapacity":
             return `sum(kube_node_status_allocatable{resource="memory"}) by (node)`;
           case "cpuUsage":
-            return `sum(rate(node_cpu_seconds_total{mode=~"user|system"}[${this.rateAccuracy}])) by(kubernetes_node)`;
+            return `sum(rate(node_cpu_seconds_total{mode=~"user|system"}[${rateAccuracy}])) by(kubernetes_node)`;
           case "cpuCapacity":
             return `sum(kube_node_status_allocatable{resource="cpu"}) by (node)`;
           case "cpuAllocatableCapacity":
@@ -81,7 +71,7 @@ export class PrometheusLens extends PrometheusProvider {
       case "pods":
         switch (queryName) {
           case "cpuUsage":
-            return `sum(rate(container_cpu_usage_seconds_total{container!="POD",container!="",pod=~"${opts.pods}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_cpu_usage_seconds_total{container!="POD",container!="",pod=~"${opts.pods}",namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "cpuRequests":
             return `sum(kube_pod_container_resource_requests{pod=~"${opts.pods}",resource="cpu",namespace="${opts.namespace}"}) by (${opts.selector})`;
           case "cpuLimits":
@@ -95,13 +85,13 @@ export class PrometheusLens extends PrometheusProvider {
           case "fsUsage":
             return `sum(container_fs_usage_bytes{container!="POD",container!="",pod=~"${opts.pods}",namespace="${opts.namespace}"}) by (${opts.selector})`;
           case "fsWrites":
-            return `sum(rate(container_fs_writes_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_fs_writes_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "fsReads":
-            return `sum(rate(container_fs_reads_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_fs_reads_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "networkReceive":
-            return `sum(rate(container_network_receive_bytes_total{pod=~"${opts.pods}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_network_receive_bytes_total{pod=~"${opts.pods}",namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "networkTransmit":
-            return `sum(rate(container_network_transmit_bytes_total{pod=~"${opts.pods}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_network_transmit_bytes_total{pod=~"${opts.pods}",namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
         }
         break;
       case "pvc":
@@ -115,17 +105,42 @@ export class PrometheusLens extends PrometheusProvider {
       case "ingress":
         switch (queryName) {
           case "bytesSentSuccess":
-            return this.bytesSent(opts.ingress, opts.namespace, "^2\\\\d*");
+            return bytesSent({
+              rateAccuracy,
+              ingress: opts.ingress,
+              namespace: opts.namespace,
+              statuses: "^2\\\\d*",
+            });
           case "bytesSentFailure":
-            return this.bytesSent(opts.ingress, opts.namespace, "^5\\\\d*");
+            return bytesSent({
+              rateAccuracy,
+              ingress: opts.ingress,
+              namespace: opts.namespace,
+              statuses: "^5\\\\d*",
+            });
           case "requestDurationSeconds":
-            return `sum(rate(nginx_ingress_controller_request_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`;
+            return `sum(rate(nginx_ingress_controller_request_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${rateAccuracy}])) by (ingress, namespace)`;
           case "responseDurationSeconds":
-            return `sum(rate(nginx_ingress_controller_response_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`;
+            return `sum(rate(nginx_ingress_controller_response_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${rateAccuracy}])) by (ingress, namespace)`;
         }
         break;
     }
 
-    throw new Error(`Unknown query name ${inspect(queryName, false, undefined, false)} for category: ${inspect(opts.category, false, undefined, false)}`);
+    throw new Error(`Unknown queryName="${queryName}" for category="${opts.category}"`);
   }
-}
+);
+
+const lensPrometheusProviderInjectable = getInjectable({
+  id: "lens-prometheus-provider",
+  instantiate: () => createPrometheusProvider({
+    kind: "lens",
+    name: "Lens",
+    isConfigurable: false,
+    getQuery: getLensLikeQueryFor({ rateAccuracy: "1m" }),
+    getService: (client) => findNamespacedService(client, "prometheus", "lens-metrics"),
+  }),
+  injectionToken: prometheusProviderInjectionToken,
+});
+
+export default lensPrometheusProviderInjectable;
+
diff --git a/src/main/prometheus/operator.ts b/src/main/prometheus/operator-provider.injectable.ts.ts
similarity index 77%
rename from src/main/prometheus/operator.ts
rename to src/main/prometheus/operator-provider.injectable.ts.ts
index 504bb93136..02891d873b 100644
--- a/src/main/prometheus/operator.ts
+++ b/src/main/prometheus/operator-provider.injectable.ts.ts
@@ -3,22 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { PrometheusService } from "./provider-registry";
-import { PrometheusProvider } from "./provider-registry";
-import type { CoreV1Api } from "@kubernetes/client-node";
-import { inspect } from "util";
+import type { PrometheusProvider } from "./provider";
+import { bytesSent, createPrometheusProvider, findFirstNamespacedService, prometheusProviderInjectionToken  } from "./provider";
+import { getInjectable } from "@ogre-tools/injectable";
 
-export class PrometheusOperator extends PrometheusProvider {
-  readonly rateAccuracy: string = "1m";
-  readonly id: string = "operator";
-  readonly name: string = "Prometheus Operator";
-  readonly isConfigurable: boolean = true;
-
-  public async getPrometheusService(client: CoreV1Api): Promise<PrometheusService> {
-    return this.getFirstNamespacedService(client, "operated-prometheus=true");
-  }
-
-  public getQuery(opts: Record<string, string>, queryName: string): string {
+export const getOperatorLikeQueryFor = ({ rateAccuracy }: { rateAccuracy: string }): PrometheusProvider["getQuery"] => (
+  (opts, queryName) => {
     switch(opts.category) {
       case "cluster":
         switch (queryName) {
@@ -35,7 +25,7 @@ export class PrometheusOperator extends PrometheusProvider {
           case "memoryAllocatableCapacity":
             return `sum(kube_node_status_allocatable{node=~"${opts.nodes}", resource="memory"})`;
           case "cpuUsage":
-            return `sum(rate(node_cpu_seconds_total{mode=~"user|system"}[${this.rateAccuracy}])* on (pod,namespace) group_left(node) kube_pod_info{node=~"${opts.nodes}"})`;
+            return `sum(rate(node_cpu_seconds_total{mode=~"user|system"}[${rateAccuracy}])* on (pod,namespace) group_left(node) kube_pod_info{node=~"${opts.nodes}"})`;
           case "cpuRequests":
             return `sum(kube_pod_container_resource_requests{node=~"${opts.nodes}", resource="cpu"})`;
           case "cpuLimits":
@@ -67,7 +57,7 @@ export class PrometheusOperator extends PrometheusProvider {
           case "memoryAllocatableCapacity":
             return `sum(kube_node_status_allocatable{resource="memory"}) by (node)`;
           case "cpuUsage":
-            return `sum(rate(node_cpu_seconds_total{mode=~"user|system"}[${this.rateAccuracy}]) * on (pod, namespace) group_left(node) kube_pod_info) by (node)`;
+            return `sum(rate(node_cpu_seconds_total{mode=~"user|system"}[${rateAccuracy}]) * on (pod, namespace) group_left(node) kube_pod_info) by (node)`;
           case "cpuCapacity":
             return `sum(kube_node_status_allocatable{resource="cpu"}) by (node)`;
           case "cpuAllocatableCapacity":
@@ -81,7 +71,7 @@ export class PrometheusOperator extends PrometheusProvider {
       case "pods":
         switch (queryName) {
           case "cpuUsage":
-            return `sum(rate(container_cpu_usage_seconds_total{container!="", image!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_cpu_usage_seconds_total{container!="", image!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "cpuRequests":
             return `sum(kube_pod_container_resource_requests{pod=~"${opts.pods}", resource="cpu", namespace="${opts.namespace}"}) by (${opts.selector})`;
           case "cpuLimits":
@@ -95,13 +85,13 @@ export class PrometheusOperator extends PrometheusProvider {
           case "fsUsage":
             return `sum(container_fs_usage_bytes{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}) by (${opts.selector})`;
           case "fsWrites":
-            return `sum(rate(container_fs_writes_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_fs_writes_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "fsReads":
-            return `sum(rate(container_fs_reads_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_fs_reads_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "networkReceive":
-            return `sum(rate(container_network_receive_bytes_total{pod=~"${opts.pods}", namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_network_receive_bytes_total{pod=~"${opts.pods}", namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "networkTransmit":
-            return `sum(rate(container_network_transmit_bytes_total{pod=~"${opts.pods}", namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_network_transmit_bytes_total{pod=~"${opts.pods}", namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
         }
         break;
       case "pvc":
@@ -115,17 +105,42 @@ export class PrometheusOperator extends PrometheusProvider {
       case "ingress":
         switch (queryName) {
           case "bytesSentSuccess":
-            return this.bytesSent(opts.ingress, opts.namespace, "^2\\\\d*");
+            return bytesSent({
+              rateAccuracy,
+              ingress: opts.ingress,
+              namespace: opts.namespace,
+              statuses: "^2\\\\d*",
+            });
           case "bytesSentFailure":
-            return this.bytesSent(opts.ingress, opts.namespace, "^5\\\\d*");
+            return bytesSent({
+              rateAccuracy,
+              ingress: opts.ingress,
+              namespace: opts.namespace,
+              statuses: "^5\\\\d*",
+            });
           case "requestDurationSeconds":
-            return `sum(rate(nginx_ingress_controller_request_duration_seconds_sum{ingress="${opts.ingress}", namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`;
+            return `sum(rate(nginx_ingress_controller_request_duration_seconds_sum{ingress="${opts.ingress}", namespace="${opts.namespace}"}[${rateAccuracy}])) by (ingress, namespace)`;
           case "responseDurationSeconds":
-            return `sum(rate(nginx_ingress_controller_response_duration_seconds_sum{ingress="${opts.ingress}", namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`;
+            return `sum(rate(nginx_ingress_controller_response_duration_seconds_sum{ingress="${opts.ingress}", namespace="${opts.namespace}"}[${rateAccuracy}])) by (ingress, namespace)`;
         }
         break;
     }
 
-    throw new Error(`Unknown query name ${inspect(queryName, false, undefined, false)} for category: ${inspect(opts.category, false, undefined, false)}`);
+    throw new Error(`Unknown queryName="${queryName}" for category="${opts.category}"`);
   }
-}
+);
+
+const operatorPrometheusProviderInjectable = getInjectable({
+  id: "operator-prometheus-provider",
+  instantiate: () => createPrometheusProvider({
+    kind: "operator",
+    name: "Prometheus Operator",
+    isConfigurable: true,
+    getService: (client) => findFirstNamespacedService(client, "operated-prometheus=true"),
+    getQuery: getOperatorLikeQueryFor({ rateAccuracy: "1m" }),
+  }),
+  injectionToken: prometheusProviderInjectionToken,
+});
+
+export default operatorPrometheusProviderInjectable;
+
diff --git a/src/main/prometheus/prometheus-provider-registry.injectable.ts b/src/main/prometheus/prometheus-provider-registry.injectable.ts
deleted file mode 100644
index bac9e1a728..0000000000
--- a/src/main/prometheus/prometheus-provider-registry.injectable.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { PrometheusProviderRegistry } from "./provider-registry";
-
-const prometheusProviderRegistryInjectable = getInjectable({
-  id: "prometheus-provider-registry",
-  instantiate: () => new PrometheusProviderRegistry(),
-});
-
-export default prometheusProviderRegistryInjectable;
diff --git a/src/main/prometheus/provider-registry.ts b/src/main/prometheus/provider-registry.ts
deleted file mode 100644
index c63b22f374..0000000000
--- a/src/main/prometheus/provider-registry.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { CoreV1Api } from "@kubernetes/client-node";
-import { isRequestError } from "../../common/utils";
-
-export interface PrometheusService {
-  id: string;
-  namespace: string;
-  service: string;
-  port: number;
-}
-
-export abstract class PrometheusProvider {
-  abstract readonly id: string;
-  abstract readonly name: string;
-  abstract readonly rateAccuracy: string;
-  abstract readonly isConfigurable: boolean;
-
-  abstract getQuery(opts: Record<string, string>, queryName: string): string;
-  abstract getPrometheusService(client: CoreV1Api): Promise<PrometheusService | undefined>;
-
-  protected bytesSent(ingress: string, namespace: string, statuses: string): string {
-    return `sum(rate(nginx_ingress_controller_bytes_sent_sum{ingress="${ingress}",namespace="${namespace}",status=~"${statuses}"}[${this.rateAccuracy}])) by (ingress, namespace)`;
-  }
-
-  protected async getFirstNamespacedService(client: CoreV1Api, ...selectors: string[]): Promise<PrometheusService> {
-    try {
-      for (const selector of selectors) {
-        const { body: { items: [service] }} = await client.listServiceForAllNamespaces(undefined, undefined, undefined, selector);
-
-        if (service?.metadata?.namespace && service.metadata.name && service.spec?.ports) {
-          return {
-            id: this.id,
-            namespace: service.metadata.namespace,
-            service: service.metadata.name,
-            port: service.spec.ports[0].port,
-          };
-        }
-      }
-    } catch (error) {
-      throw new Error(`Failed to list services for Prometheus${this.name} in all namespaces: ${isRequestError(error) ? error.response?.body.message : error}`);
-    }
-
-    throw new Error(`No service found for Prometheus${this.name} from any namespace`);
-  }
-
-  protected async getNamespacedService(client: CoreV1Api, name: string, namespace: string): Promise<PrometheusService> {
-    try {
-      const { body: service } = await client.readNamespacedService(name, namespace);
-
-      if (!service.metadata?.namespace || !service.metadata.name || !service.spec?.ports) {
-        throw new Error(`Service returned from Prometheus${this.name} in namespace="${namespace}" did not have required information`);
-      }
-
-      return {
-        id: this.id,
-        namespace: service.metadata.namespace,
-        service: service.metadata.name,
-        port: service.spec.ports[0].port,
-      };
-    } catch(error) {
-      throw new Error(`Failed to list services for Prometheus${this.name} in namespace="${namespace}": ${isRequestError(error) ? error.response?.body.message : error}`);
-    }
-  }
-}
-
-export class PrometheusProviderRegistry {
-  public providers = new Map<string, PrometheusProvider>();
-
-  getByKind(kind: string): PrometheusProvider {
-    const provider = this.providers.get(kind);
-
-    if (!provider) {
-      throw new Error("Unknown Prometheus provider");
-    }
-
-    return provider;
-  }
-
-  registerProvider(provider: PrometheusProvider): this {
-    if (this.providers.has(provider.id)) {
-      throw new Error("Provider already registered under that kind");
-    }
-
-    this.providers.set(provider.id, provider);
-
-    return this;
-  }
-}
diff --git a/src/main/prometheus/provider.ts b/src/main/prometheus/provider.ts
new file mode 100644
index 0000000000..8944c4c0ed
--- /dev/null
+++ b/src/main/prometheus/provider.ts
@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { CoreV1Api } from "@kubernetes/client-node";
+import { getInjectionToken } from "@ogre-tools/injectable";
+import { isRequestError } from "../../common/utils";
+
+export interface PrometheusService extends PrometheusServiceInfo {
+  kind: string;
+}
+
+export interface PrometheusServiceInfo {
+  namespace: string;
+  service: string;
+  port: number;
+}
+
+export interface PrometheusProvider {
+  readonly kind: string;
+  readonly name: string;
+  readonly isConfigurable: boolean;
+
+  getQuery(opts: Record<string, string>, queryName: string): string;
+  getPrometheusService(client: CoreV1Api): Promise<PrometheusService>;
+}
+
+export interface CreatePrometheusProviderOpts {
+  readonly kind: string;
+  readonly name: string;
+  readonly isConfigurable: boolean;
+
+  getQuery(opts: Record<string, string>, queryName: string): string;
+  getService(client: CoreV1Api): Promise<PrometheusServiceInfo>;
+}
+
+export const createPrometheusProvider = ({ getService, ...opts }: CreatePrometheusProviderOpts): PrometheusProvider => ({
+  ...opts,
+  getPrometheusService: async (client) => {
+    try {
+      return {
+        kind: opts.kind,
+        ...await getService(client),
+      };
+    } catch (error) {
+      throw new Error(`Failed to find Prometheus provider for "${opts.name}"`, { cause: error });
+    }
+  },
+});
+
+export async function findFirstNamespacedService(client: CoreV1Api, ...selectors: string[]): Promise<PrometheusServiceInfo> {
+  try {
+    for (const selector of selectors) {
+      const { body: { items: [service] }} = await client.listServiceForAllNamespaces(undefined, undefined, undefined, selector);
+
+      if (service?.metadata?.namespace && service.metadata.name && service.spec?.ports) {
+        return {
+          namespace: service.metadata.namespace,
+          service: service.metadata.name,
+          port: service.spec.ports[0].port,
+        };
+      }
+    }
+  } catch (error) {
+    throw new Error(`Failed to list services in all namespaces: ${isRequestError(error) ? error.response?.body.message : error}`);
+  }
+
+  throw new Error(`No service found from any namespace`);
+}
+
+export async function findNamespacedService(client: CoreV1Api, name: string, namespace: string): Promise<PrometheusServiceInfo> {
+  try {
+    const { body: service } = await client.readNamespacedService(name, namespace);
+
+    if (!service.metadata?.namespace || !service.metadata.name || !service.spec?.ports) {
+      throw new Error(`Service found in namespace="${namespace}" did not have required information`);
+    }
+
+    return {
+      namespace: service.metadata.namespace,
+      service: service.metadata.name,
+      port: service.spec.ports[0].port,
+    };
+  } catch(error) {
+    throw new Error(`Failed to list services in namespace="${namespace}": ${isRequestError(error) ? error.response?.body.message : error}`);
+  }
+}
+
+export interface BytesSentArgs {
+  rateAccuracy: string;
+  ingress: string;
+  namespace: string;
+  statuses: string;
+}
+
+export function bytesSent({ rateAccuracy, ingress, namespace, statuses }: BytesSentArgs): string {
+  return `sum(rate(nginx_ingress_controller_bytes_sent_sum{ingress="${ingress}",namespace="${namespace}",status=~"${statuses}"}[${rateAccuracy}])) by (ingress, namespace)`;
+}
+
+export const prometheusProviderInjectionToken = getInjectionToken<PrometheusProvider>({
+  id: "prometheus-provider",
+});
diff --git a/src/main/prometheus/providers.injectable.ts b/src/main/prometheus/providers.injectable.ts
new file mode 100644
index 0000000000..73fe2dfe50
--- /dev/null
+++ b/src/main/prometheus/providers.injectable.ts
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
+import { prometheusProviderInjectionToken } from "./provider";
+
+const prometheusProvidersInjectable = getInjectable({
+  id: "prometheus-providers",
+  instantiate: (di) => {
+    const computedInjectMany = di.inject(computedInjectManyInjectable);
+
+    return computedInjectMany(prometheusProviderInjectionToken);
+  },
+});
+
+export default prometheusProvidersInjectable;
diff --git a/src/main/prometheus/stacklight.ts b/src/main/prometheus/stacklight-provider.injectable.ts
similarity index 77%
rename from src/main/prometheus/stacklight.ts
rename to src/main/prometheus/stacklight-provider.injectable.ts
index 0eee912a24..ca7a946466 100644
--- a/src/main/prometheus/stacklight.ts
+++ b/src/main/prometheus/stacklight-provider.injectable.ts
@@ -3,22 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { PrometheusService } from "./provider-registry";
-import { PrometheusProvider } from "./provider-registry";
-import type { CoreV1Api } from "@kubernetes/client-node";
-import { inspect } from "util";
+import type { PrometheusProvider } from "./provider";
+import { bytesSent, createPrometheusProvider, findFirstNamespacedService, prometheusProviderInjectionToken } from "./provider";
+import { getInjectable } from "@ogre-tools/injectable";
 
-export class PrometheusStacklight extends PrometheusProvider {
-  readonly id: string = "stacklight";
-  readonly name: string = "Stacklight";
-  readonly rateAccuracy: string = "1m";
-  readonly isConfigurable: boolean = true;
-
-  public getPrometheusService(client: CoreV1Api): Promise<PrometheusService> {
-    return this.getNamespacedService(client, "prometheus-server", "stacklight");
-  }
-
-  public getQuery(opts: Record<string, string>, queryName: string): string {
+export const getStacklightLikeQueryFor = ({ rateAccuracy }: { rateAccuracy: string }): PrometheusProvider["getQuery"] => (
+  (opts, queryName) => {
     switch(opts.category) {
       case "cluster":
         switch (queryName) {
@@ -35,7 +25,7 @@ export class PrometheusStacklight extends PrometheusProvider {
           case "memoryAllocatableCapacity":
             return `sum(kube_node_status_allocatable{node=~"${opts.nodes}", resource="memory"}) by (component)`;
           case "cpuUsage":
-            return `sum(rate(node_cpu_seconds_total{node=~"${opts.nodes}", mode=~"user|system"}[${this.rateAccuracy}]))`;
+            return `sum(rate(node_cpu_seconds_total{node=~"${opts.nodes}", mode=~"user|system"}[${rateAccuracy}]))`;
           case "cpuRequests":
             return `sum(kube_pod_container_resource_requests{node=~"${opts.nodes}", resource="cpu"}) by (component)`;
           case "cpuLimits":
@@ -67,7 +57,7 @@ export class PrometheusStacklight extends PrometheusProvider {
           case "memoryAllocatableCapacity":
             return `sum(kube_node_status_allocatable{resource="memory"}) by (node)`;
           case "cpuUsage":
-            return `sum(rate(node_cpu_seconds_total{mode=~"user|system"}[${this.rateAccuracy}])) by(node)`;
+            return `sum(rate(node_cpu_seconds_total{mode=~"user|system"}[${rateAccuracy}])) by(node)`;
           case "cpuCapacity":
             return `sum(kube_node_status_allocatable{resource="cpu"}) by (node)`;
           case "cpuAllocatableCapacity":
@@ -81,7 +71,7 @@ export class PrometheusStacklight extends PrometheusProvider {
       case "pods":
         switch (queryName) {
           case "cpuUsage":
-            return `sum(rate(container_cpu_usage_seconds_total{container!="POD",container!="",pod=~"${opts.pods}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_cpu_usage_seconds_total{container!="POD",container!="",pod=~"${opts.pods}",namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "cpuRequests":
             return `sum(kube_pod_container_resource_requests{pod=~"${opts.pods}",resource="cpu",namespace="${opts.namespace}"}) by (${opts.selector})`;
           case "cpuLimits":
@@ -95,13 +85,13 @@ export class PrometheusStacklight extends PrometheusProvider {
           case "fsUsage":
             return `sum(container_fs_usage_bytes{container!="POD",container!="",pod=~"${opts.pods}",namespace="${opts.namespace}"}) by (${opts.selector})`;
           case "fsWrites":
-            return `sum(rate(container_fs_writes_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_fs_writes_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "fsReads":
-            return `sum(rate(container_fs_reads_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_fs_reads_bytes_total{container!="", pod=~"${opts.pods}", namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "networkReceive":
-            return `sum(rate(container_network_receive_bytes_total{pod=~"${opts.pods}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_network_receive_bytes_total{pod=~"${opts.pods}",namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
           case "networkTransmit":
-            return `sum(rate(container_network_transmit_bytes_total{pod=~"${opts.pods}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (${opts.selector})`;
+            return `sum(rate(container_network_transmit_bytes_total{pod=~"${opts.pods}",namespace="${opts.namespace}"}[${rateAccuracy}])) by (${opts.selector})`;
         }
         break;
       case "pvc":
@@ -115,17 +105,42 @@ export class PrometheusStacklight extends PrometheusProvider {
       case "ingress":
         switch (queryName) {
           case "bytesSentSuccess":
-            return this.bytesSent(opts.ingress, opts.namespace, "^2\\\\d*");
+            return bytesSent({
+              rateAccuracy,
+              ingress: opts.ingress,
+              namespace: opts.namespace,
+              statuses: "^2\\\\d*",
+            });
           case "bytesSentFailure":
-            return this.bytesSent(opts.ingress, opts.namespace, "^5\\\\d*");
+            return bytesSent({
+              rateAccuracy,
+              ingress: opts.ingress,
+              namespace: opts.namespace,
+              statuses: "^5\\\\d*",
+            });
           case "requestDurationSeconds":
-            return `sum(rate(nginx_ingress_controller_request_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`;
+            return `sum(rate(nginx_ingress_controller_request_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${rateAccuracy}])) by (ingress, namespace)`;
           case "responseDurationSeconds":
-            return `sum(rate(nginx_ingress_controller_response_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`;
+            return `sum(rate(nginx_ingress_controller_response_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${rateAccuracy}])) by (ingress, namespace)`;
         }
         break;
     }
 
-    throw new Error(`Unknown query name ${inspect(queryName, false, undefined, false)} for category: ${inspect(opts.category, false, undefined, false)}`);
+    throw new Error(`Unknown queryName="${queryName}" for category="${opts.category}"`);
   }
-}
+);
+
+const stacklightPrometheusProviderInjectable = getInjectable({
+  id: "stacklight-prometheus-provider",
+  instantiate: () => createPrometheusProvider({
+    kind: "stacklight",
+    name: "Stacklight",
+    isConfigurable: true,
+    getService: (client) => findFirstNamespacedService(client, "prometheus-server", "stacklight"),
+    getQuery: getStacklightLikeQueryFor({ rateAccuracy: "1m" }),
+  }),
+  injectionToken: prometheusProviderInjectionToken,
+});
+
+export default stacklightPrometheusProviderInjectable;
+
diff --git a/src/main/resource-applier.ts b/src/main/resource-applier.ts
deleted file mode 100644
index 30c85e8fa0..0000000000
--- a/src/main/resource-applier.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { Cluster } from "../common/cluster/cluster";
-import type { KubernetesObject } from "@kubernetes/client-node";
-import { exec } from "child_process";
-import fs from "fs-extra";
-import * as yaml from "js-yaml";
-import path from "path";
-import tempy from "tempy";
-import logger from "./logger";
-import { appEventBus } from "../common/app-event-bus/event-bus";
-import { isChildProcessError } from "../common/utils";
-import type { Patch } from "rfc6902";
-import { promiseExecFile } from "../common/utils/promise-exec";
-
-export class ResourceApplier {
-  constructor(protected cluster: Cluster) {}
-
-  /**
-   * Patch a kube resource's manifest, throwing any error that occurs.
-   * @param name The name of the kube resource
-   * @param kind The kind of the kube resource
-   * @param patch The list of JSON operations
-   * @param ns The optional namespace of the kube resource
-   */
-  async patch(name: string, kind: string, patch: Patch, ns?: string): Promise<string> {
-    appEventBus.emit({ name: "resource", action: "patch" });
-
-    const kubectl = await this.cluster.ensureKubectl();
-    const kubectlPath = await kubectl.getPath();
-    const proxyKubeconfigPath = await this.cluster.getProxyKubeconfigPath();
-    const args = [
-      "--kubeconfig", proxyKubeconfigPath,
-      "patch",
-      kind,
-      name,
-    ];
-
-    if (ns) {
-      args.push("--namespace", ns);
-    }
-
-    args.push(
-      "--type", "json",
-      "--patch", JSON.stringify(patch),
-      "-o", "json",
-    );
-
-    try {
-      const { stdout } = await promiseExecFile(kubectlPath, args);
-
-      return stdout;
-    } catch (error) {
-      if (isChildProcessError(error)) {
-        throw error.stderr ?? error;
-      }
-
-      throw error;
-    }
-  }
-
-  async apply(resource: KubernetesObject | any): Promise<string> {
-    resource = this.sanitizeObject(resource);
-    appEventBus.emit({ name: "resource", action: "apply" });
-
-    return this.kubectlApply(yaml.dump(resource));
-  }
-
-  protected async kubectlApply(content: string): Promise<string> {
-    const kubectl = await this.cluster.ensureKubectl();
-    const kubectlPath = await kubectl.getPath();
-    const proxyKubeconfigPath = await this.cluster.getProxyKubeconfigPath();
-    const fileName = tempy.file({ name: "resource.yaml" });
-    const args = [
-      "apply",
-      "--kubeconfig", proxyKubeconfigPath,
-      "-o", "json",
-      "-f", fileName,
-    ];
-
-    logger.debug(`shooting manifests with ${kubectlPath}`, { args });
-
-    const execEnv = { ...process.env };
-    const httpsProxy = this.cluster.preferences?.httpsProxy;
-
-    if (httpsProxy) {
-      execEnv.HTTPS_PROXY = httpsProxy;
-    }
-
-    try {
-      await fs.writeFile(fileName, content);
-      const { stdout } = await promiseExecFile(kubectlPath, args);
-
-      return stdout;
-    } catch (error) {
-      if (isChildProcessError(error)) {
-        throw error.stderr ?? error;
-      }
-
-      throw error;
-    } finally {
-      await fs.unlink(fileName);
-    }
-  }
-
-  public async kubectlApplyAll(resources: string[], extraArgs = ["-o", "json"]): Promise<string> {
-    return this.kubectlCmdAll("apply", resources, extraArgs);
-  }
-
-  public async kubectlDeleteAll(resources: string[], extraArgs?: string[]): Promise<string> {
-    return this.kubectlCmdAll("delete", resources, extraArgs);
-  }
-
-  protected async kubectlCmdAll(subCmd: string, resources: string[], args: string[] = []): Promise<string> {
-    const kubectl = await this.cluster.ensureKubectl();
-    const kubectlPath = await kubectl.getPath();
-    const proxyKubeconfigPath = await this.cluster.getProxyKubeconfigPath();
-
-    return new Promise((resolve, reject) => {
-      const tmpDir = tempy.directory();
-
-      // Dump each resource into tmpDir
-      resources.forEach((resource, index) => {
-        fs.writeFileSync(path.join(tmpDir, `${index}.yaml`), resource);
-      });
-      args.push("-f", `"${tmpDir}"`);
-      const cmd = `"${kubectlPath}" ${subCmd} --kubeconfig "${proxyKubeconfigPath}" ${args.join(" ")}`;
-
-      logger.info(`[RESOURCE-APPLIER] running cmd ${cmd}`);
-      exec(cmd, (error, stdout) => {
-        if (error) {
-          logger.error(`[RESOURCE-APPLIER] cmd errored: ${error}`);
-          const splitError = error.toString().split(`.yaml": `);
-
-          if (splitError[1]) {
-            reject(splitError[1]);
-          } else {
-            reject(error);
-          }
-
-          return;
-        }
-
-        resolve(stdout);
-      });
-    });
-  }
-
-  protected sanitizeObject(resource: KubernetesObject | any) {
-    const res = JSON.parse(JSON.stringify(resource));
-
-    delete res.status;
-    delete res.metadata?.resourceVersion;
-    const annotations = res.metadata?.annotations;
-
-    if (annotations) {
-      delete annotations["kubectl.kubernetes.io/last-applied-configuration"];
-    }
-
-    return res;
-  }
-}
diff --git a/src/main/resource-applier/create-resource-applier.injectable.ts b/src/main/resource-applier/create-resource-applier.injectable.ts
new file mode 100644
index 0000000000..04e69d29d4
--- /dev/null
+++ b/src/main/resource-applier/create-resource-applier.injectable.ts
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import emitAppEventInjectable from "../../common/app-event-bus/emit-event.injectable";
+import type { Cluster } from "../../common/cluster/cluster";
+import deleteFileInjectable from "../../common/fs/delete-file.injectable";
+import execFileInjectable from "../../common/fs/exec-file.injectable";
+import writeFileInjectable from "../../common/fs/write-file.injectable";
+import loggerInjectable from "../../common/logger.injectable";
+import joinPathsInjectable from "../../common/path/join-paths.injectable";
+import type { ResourceApplierDependencies } from "./resource-applier";
+import { ResourceApplier } from "./resource-applier";
+
+export type CreateResourceApplier = (cluster: Cluster) => ResourceApplier;
+
+const createResourceApplierInjectable = getInjectable({
+  id: "create-resource-applier",
+  instantiate: (di): CreateResourceApplier => {
+    const deps: ResourceApplierDependencies = {
+      deleteFile: di.inject(deleteFileInjectable),
+      emitAppEvent: di.inject(emitAppEventInjectable),
+      execFile: di.inject(execFileInjectable),
+      joinPaths: di.inject(joinPathsInjectable),
+      logger: di.inject(loggerInjectable),
+      writeFile: di.inject(writeFileInjectable),
+    };
+
+    return (cluster) => new ResourceApplier(deps, cluster);
+  },
+});
+
+export default createResourceApplierInjectable;
diff --git a/src/main/resource-applier/resource-applier.ts b/src/main/resource-applier/resource-applier.ts
new file mode 100644
index 0000000000..3384b1cbf2
--- /dev/null
+++ b/src/main/resource-applier/resource-applier.ts
@@ -0,0 +1,167 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { Cluster } from "../../common/cluster/cluster";
+import * as yaml from "js-yaml";
+import tempy from "tempy";
+import type { Patch } from "rfc6902";
+import type { KubernetesObject } from "@kubernetes/client-node";
+import type { EmitAppEvent } from "../../common/app-event-bus/emit-event.injectable";
+import type { Logger } from "../../common/logger";
+import type { WriteFile } from "../../common/fs/write-file.injectable";
+import type { DeleteFile } from "../../common/fs/delete-file.injectable";
+import type { ExecFile } from "../../common/fs/exec-file.injectable";
+import type { JoinPaths } from "../../common/path/join-paths.injectable";
+import type { AsyncResult } from "../../common/utils/async-result";
+
+export interface ResourceApplierDependencies {
+  emitAppEvent: EmitAppEvent;
+  writeFile: WriteFile;
+  deleteFile: DeleteFile;
+  execFile: ExecFile;
+  joinPaths: JoinPaths;
+  readonly logger: Logger;
+}
+
+export class ResourceApplier {
+  constructor(protected readonly dependencies: ResourceApplierDependencies, protected readonly cluster: Cluster) {}
+
+  /**
+   * Patch a kube resource's manifest, throwing any error that occurs.
+   * @param name The name of the kube resource
+   * @param kind The kind of the kube resource
+   * @param patch The list of JSON operations
+   * @param ns The optional namespace of the kube resource
+   */
+  async patch(name: string, kind: string, patch: Patch, ns?: string): Promise<string> {
+    this.dependencies.emitAppEvent({ name: "resource", action: "patch" });
+
+    const kubectl = await this.cluster.ensureKubectl();
+    const kubectlPath = await kubectl.getPath();
+    const proxyKubeconfigPath = await this.cluster.getProxyKubeconfigPath();
+    const args = [
+      "--kubeconfig", proxyKubeconfigPath,
+      "patch",
+      kind,
+      name,
+    ];
+
+    if (ns) {
+      args.push("--namespace", ns);
+    }
+
+    args.push(
+      "--type", "json",
+      "--patch", JSON.stringify(patch),
+      "-o", "json",
+    );
+
+    const result = await this.dependencies.execFile(kubectlPath, args);
+
+    if (result.callWasSuccessful) {
+      return result.response;
+    }
+
+    throw result.error.stderr || result.error.message;
+  }
+
+  async create(resource: string): Promise<AsyncResult<string, string>> {
+    this.dependencies.emitAppEvent({ name: "resource", action: "apply" });
+
+    return this.kubectlApply(this.sanitizeObject(resource));
+  }
+
+  protected async kubectlApply(content: string): Promise<AsyncResult<string, string>> {
+    const kubectl = await this.cluster.ensureKubectl();
+    const kubectlPath = await kubectl.getPath();
+    const proxyKubeconfigPath = await this.cluster.getProxyKubeconfigPath();
+    const fileName = tempy.file({ name: "resource.yaml" });
+    const args = [
+      "apply",
+      "--kubeconfig", proxyKubeconfigPath,
+      "-o", "json",
+      "-f", fileName,
+    ];
+
+    this.dependencies.logger.debug(`shooting manifests with ${kubectlPath}`, { args });
+
+    const execEnv = { ...process.env };
+    const httpsProxy = this.cluster.preferences?.httpsProxy;
+
+    if (httpsProxy) {
+      execEnv.HTTPS_PROXY = httpsProxy;
+    }
+
+    try {
+      await this.dependencies.writeFile(fileName, content);
+
+      const result = await this.dependencies.execFile(kubectlPath, args);
+
+      if (result.callWasSuccessful) {
+        return result;
+      }
+
+      return {
+        callWasSuccessful: false,
+        error: result.error.stderr || result.error.message,
+      };
+    } finally {
+      await this.dependencies.deleteFile(fileName);
+    }
+  }
+
+  public async kubectlApplyAll(resources: string[], extraArgs = ["-o", "json"]): Promise<AsyncResult<string, string>> {
+    return this.kubectlCmdAll("apply", resources, extraArgs);
+  }
+
+  public async kubectlDeleteAll(resources: string[], extraArgs?: string[]): Promise<AsyncResult<string, string>> {
+    return this.kubectlCmdAll("delete", resources, extraArgs);
+  }
+
+  protected async kubectlCmdAll(subCmd: string, resources: string[], parentArgs: string[] = []): Promise<AsyncResult<string, string>> {
+    const kubectl = await this.cluster.ensureKubectl();
+    const kubectlPath = await kubectl.getPath();
+    const proxyKubeconfigPath = await this.cluster.getProxyKubeconfigPath();
+    const tmpDir = tempy.directory();
+
+    await Promise.all(resources.map((resource, index) => this.dependencies.writeFile(
+      this.dependencies.joinPaths(tmpDir, `${index}.yaml`),
+      resource,
+    )));
+
+    const args = [
+      subCmd,
+      "--kubeconfig", proxyKubeconfigPath,
+      ...parentArgs,
+      "-f", tmpDir,
+    ];
+
+    this.dependencies.logger.info(`[RESOURCE-APPLIER] running kubectl`, { args });
+    const result = await this.dependencies.execFile(kubectlPath, args);
+
+    if (result.callWasSuccessful) {
+      return result;
+    }
+
+    this.dependencies.logger.error(`[RESOURCE-APPLIER] kubectl errored: ${result.error.message}`);
+
+    const splitError = result.error.stderr.split(`.yaml": `);
+
+    return {
+      callWasSuccessful: false,
+      error: splitError[1] || result.error.message,
+    };
+  }
+
+  protected sanitizeObject(resource: string) {
+    const res = yaml.load(resource) as Partial<KubernetesObject> & { status?: object };
+
+    delete res.status;
+    delete res.metadata?.resourceVersion;
+    delete res.metadata?.annotations?.["kubectl.kubernetes.io/last-applied-configuration"];
+
+    return yaml.dump(res);
+  }
+}
diff --git a/src/main/router/create-handler-for-route.injectable.ts b/src/main/router/create-handler-for-route.injectable.ts
new file mode 100644
index 0000000000..60f62fd282
--- /dev/null
+++ b/src/main/router/create-handler-for-route.injectable.ts
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { ServerResponse } from "http";
+import loggerInjectable from "../../common/logger.injectable";
+import { object } from "../../common/utils";
+import type { LensApiRequest, Route } from "./route";
+import { contentTypes } from "./router-content-types";
+
+export type RouteHandler = (request: LensApiRequest<string>, response: ServerResponse) => Promise<void>;
+export type CreateHandlerForRoute = (route: Route<unknown, string>) => RouteHandler;
+
+interface LensServerResponse {
+  statusCode: number;
+  content: any;
+  headers: {
+    [name: string]: string;
+  };
+}
+
+const writeServerResponseFor = (serverResponse: ServerResponse) => ({
+  statusCode,
+  content,
+  headers,
+}: LensServerResponse) => {
+  serverResponse.statusCode = statusCode;
+
+  for (const [name, value] of object.entries(headers)) {
+    serverResponse.setHeader(name, value);
+  }
+
+  if (content instanceof Buffer) {
+    serverResponse.write(content);
+    serverResponse.end();
+  } else if (content) {
+    serverResponse.end(content);
+  } else {
+    serverResponse.end();
+  }
+};
+
+const createHandlerForRouteInjectable = getInjectable({
+  id: "create-handler-for-route",
+  instantiate: (di): CreateHandlerForRoute => {
+    const logger = di.inject(loggerInjectable);
+
+    return (route) => async (request, response) => {
+      const writeServerResponse = writeServerResponseFor(response);
+
+      try {
+        const result = await route.handler(request);
+
+        if (!result) {
+          const mappedResult = contentTypes.txt.resultMapper({
+            statusCode: 204,
+            response: undefined,
+          });
+
+          writeServerResponse(mappedResult);
+        } else if (!result.proxy) {
+          const contentType = result.contentType || contentTypes.json;
+
+          writeServerResponse(contentType.resultMapper(result));
+        }
+      } catch(error) {
+        const mappedResult = contentTypes.txt.resultMapper({
+          statusCode: 500,
+          error: error ? String(error) : "unknown error",
+        });
+
+        logger.error(`[ROUTER]: route ${route.path}, called with ${request.path}, threw an error`, error);
+        writeServerResponse(mappedResult);
+      }
+    };
+  },
+});
+
+export default createHandlerForRouteInjectable;
diff --git a/src/main/router/router.injectable.ts b/src/main/router/router.injectable.ts
index 23d6c78fc4..896f875332 100644
--- a/src/main/router/router.injectable.ts
+++ b/src/main/router/router.injectable.ts
@@ -2,39 +2,34 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { Injectable } from "@ogre-tools/injectable";
-import { getInjectable, getInjectionToken, lifecycleEnum } from "@ogre-tools/injectable";
+import type { Injectable, InjectionToken } from "@ogre-tools/injectable";
+import { getInjectable, getInjectionToken } from "@ogre-tools/injectable";
 import { Router } from "./router";
 import parseRequestInjectable from "./parse-request.injectable";
 import type { Route } from "./route";
+import createHandlerForRouteInjectable from "./create-handler-for-route.injectable";
 
 export const routeInjectionToken = getInjectionToken<Route<unknown, string>>({
   id: "route-injection-token",
 });
 
-export function getRouteInjectable<
-  T,
-  Path extends string,
->(
+export function getRouteInjectable<T, Path extends string>(
   opts: Omit<Injectable<Route<T, Path>, Route<T, Path>, void>, "lifecycle" | "injectionToken">,
-): Injectable<Route<T, Path>, Route<T, Path>, void> {
-  return {
+) {
+  return getInjectable({
     ...opts,
-    injectionToken: routeInjectionToken as never,
-    lifecycle: lifecycleEnum.singleton as never,
-  };
+    injectionToken: routeInjectionToken as unknown as InjectionToken<Route<T, Path>, void>,
+  });
 }
 
 const routerInjectable = getInjectable({
   id: "router",
 
-  instantiate: (di) => {
-    const routes = di.injectMany(routeInjectionToken);
-
-    return new Router(routes, {
-      parseRequest: di.inject(parseRequestInjectable),
-    });
-  },
+  instantiate: (di) => new Router({
+    parseRequest: di.inject(parseRequestInjectable),
+    routes: di.injectMany(routeInjectionToken),
+    createHandlerForRoute: di.inject(createHandlerForRouteInjectable),
+  }),
 });
 
 export default routerInjectable;
diff --git a/src/main/router/router.test.ts b/src/main/router/router.test.ts
index a487104c72..a557eaa6c1 100644
--- a/src/main/router/router.test.ts
+++ b/src/main/router/router.test.ts
@@ -20,6 +20,7 @@ import type { SetRequired } from "type-fest";
 import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
 import kubectlBinaryNameInjectable from "../kubectl/binary-name.injectable";
 import kubectlDownloadingNormalizedArchInjectable from "../kubectl/normalized-arch.injectable";
+import fsInjectable from "../../common/fs/fs.injectable";
 import { runInAction } from "mobx";
 
 describe("router", () => {
@@ -32,6 +33,7 @@ describe("router", () => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
     mockFs();
+    di.permitSideEffects(fsInjectable);
 
     di.override(parseRequestInjectable, () => () => Promise.resolve({
       payload: "some-payload",
diff --git a/src/main/router/router.ts b/src/main/router/router.ts
index 5b07822142..9cb070ed1d 100644
--- a/src/main/router/router.ts
+++ b/src/main/router/router.ts
@@ -5,12 +5,11 @@
 
 import Call from "@hapi/call";
 import type http from "http";
-import { toPairs } from "lodash/fp";
 import type { Cluster } from "../../common/cluster/cluster";
-import { contentTypes } from "./router-content-types";
-import type { LensApiRequest, LensApiResult, Route } from "./route";
+import type { LensApiRequest, Route } from "./route";
 import type { ServerIncomingMessage } from "../lens-proxy/lens-proxy";
 import type { ParseRequest } from "./parse-request.injectable";
+import type { CreateHandlerForRoute, RouteHandler } from "./create-handler-for-route.injectable";
 
 export interface RouterRequestOpts {
   req: http.IncomingMessage;
@@ -22,15 +21,17 @@ export interface RouterRequestOpts {
 
 interface Dependencies {
   parseRequest: ParseRequest;
+  createHandlerForRoute: CreateHandlerForRoute;
+  readonly routes: Route<unknown, string>[];
 }
 
 export class Router {
-  protected router = new Call.Router<ReturnType<typeof handleRoute>>();
+  private readonly router = new Call.Router<RouteHandler>();
 
-  constructor(routes: Route<unknown, string>[], private dependencies: Dependencies) {
-    routes.forEach(route => {
-      this.router.add({ method: route.method, path: route.path }, handleRoute(route));
-    });
+  constructor(private readonly dependencies: Dependencies) {
+    for (const route of this.dependencies.routes) {
+      this.router.add({ method: route.method, path: route.path }, this.dependencies.createHandlerForRoute(route));
+    }
   }
 
   public async route(cluster: Cluster | undefined, req: ServerIncomingMessage, res: http.ServerResponse): Promise<boolean> {
@@ -52,7 +53,6 @@ export class Router {
 
   protected async getRequest(opts: RouterRequestOpts): Promise<LensApiRequest<string>> {
     const { req, res, url, cluster, params } = opts;
-
     const { payload } = await this.dependencies.parseRequest(req, null, {
       parse: true,
       output: "data",
@@ -70,77 +70,3 @@ export class Router {
     };
   }
 }
-
-const handleRoute = (route: Route<unknown, string>) => async (request: LensApiRequest<string>, response: http.ServerResponse) => {
-  let result: LensApiResult<any> | void;
-
-  const writeServerResponse = writeServerResponseFor(response);
-
-  try {
-    result = await route.handler(request);
-  } catch(error) {
-    const mappedResult = contentTypes.txt.resultMapper({
-      statusCode: 500,
-      error: error ? String(error) : "unknown error",
-    });
-
-    writeServerResponse(mappedResult);
-
-    return;
-  }
-
-  if (!result) {
-    const mappedResult = contentTypes.txt.resultMapper({
-      statusCode: 204,
-      response: undefined,
-    });
-
-    writeServerResponse(mappedResult);
-
-    return;
-  }
-
-  if (result.proxy) {
-    return;
-  }
-
-  const contentType = result.contentType || contentTypes.json;
-
-  const mappedResult = contentType.resultMapper(result);
-
-  writeServerResponse(mappedResult);
-};
-
-const writeServerResponseFor =
-  (serverResponse: http.ServerResponse) =>
-    ({
-      statusCode,
-      content,
-      headers,
-    }: {
-    statusCode: number;
-    content: any;
-    headers: { [name: string]: string };
-  }) => {
-      serverResponse.statusCode = statusCode;
-
-      const headerPairs = toPairs<string>(headers);
-
-      headerPairs.forEach(([name, value]) => {
-        serverResponse.setHeader(name, value);
-      });
-
-      if (content instanceof Buffer) {
-        serverResponse.write(content);
-
-        serverResponse.end();
-
-        return;
-      }
-
-      if (content) {
-        serverResponse.end(content);
-      } else {
-        serverResponse.end();
-      }
-    };
diff --git a/src/main/routes/files/development.injectable.ts b/src/main/routes/files/development.injectable.ts
new file mode 100644
index 0000000000..dcc6fce649
--- /dev/null
+++ b/src/main/routes/files/development.injectable.ts
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import httpProxy from "http-proxy";
+import { webpackDevServerPort } from "../../../../webpack/vars";
+import { publicPath } from "../../../common/vars";
+import appNameInjectable from "../../../common/vars/app-name.injectable";
+import type { LensApiRequest, RouteResponse } from "../../router/route";
+
+const devStaticFileRouteHandlerInjectable = getInjectable({
+  id: "dev-static-file-route-handler",
+  instantiate: (di) => {
+    const proxy = httpProxy.createProxy();
+    const appName = di.inject(appNameInjectable);
+    const proxyTarget = `http://127.0.0.1:${webpackDevServerPort}`;
+
+    return async ({ raw: { req, res }}: LensApiRequest<"/{path*}">): Promise<RouteResponse<Buffer>> => {
+      if (req.url === "/" || !req.url) {
+        req.url = `${publicPath}/${appName}.html`;
+      } else if (!req.url.startsWith("/build/")) {
+        return { statusCode: 404 };
+      }
+
+      proxy.web(req, res, { target: proxyTarget });
+
+      return { proxy };
+    };
+  },
+});
+
+export default devStaticFileRouteHandlerInjectable;
diff --git a/src/main/routes/files/production.injectable.ts b/src/main/routes/files/production.injectable.ts
new file mode 100644
index 0000000000..b6f9ca5e40
--- /dev/null
+++ b/src/main/routes/files/production.injectable.ts
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import readFileBufferInjectable from "../../../common/fs/read-file-buffer.injectable";
+import joinPathsInjectable from "../../../common/path/join-paths.injectable";
+import staticFilesDirectoryInjectable from "../../../common/vars/static-files-directory.injectable";
+import appNameInjectable from "../../../common/vars/app-name.injectable";
+import type { LensApiRequest } from "../../router/route";
+import path from "path";
+import type { SupportedFileExtension } from "../../router/router-content-types";
+import { contentTypes } from "../../router/router-content-types";
+import loggerInjectable from "../../../common/logger.injectable";
+import { publicPath } from "../../../common/vars";
+
+const prodStaticFileRouteHandlerInjectable = getInjectable({
+  id: "prod-static-file-route-handler",
+  instantiate: (di) => {
+    const readFileBuffer = di.inject(readFileBufferInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
+    const staticFilesDirectory = di.inject(staticFilesDirectoryInjectable);
+    const appName = di.inject(appNameInjectable);
+    const logger = di.inject(loggerInjectable);
+
+    return async ({ params }: LensApiRequest<"/{path*}">) => {
+      let filePath = params.path;
+
+
+      for (let retryCount = 0; retryCount < 5; retryCount += 1) {
+        const assetFilePath = joinPaths(staticFilesDirectory, filePath);
+
+        if (!assetFilePath.startsWith(staticFilesDirectory)) {
+          return { statusCode: 404 };
+        }
+
+        try {
+          const fileExtension = path
+            .extname(assetFilePath)
+            .slice(1) as SupportedFileExtension;
+
+          const contentType = contentTypes[fileExtension] || contentTypes.txt;
+
+          return { response: await readFileBuffer(assetFilePath), contentType };
+        } catch (err) {
+          if (retryCount > 5) {
+            logger.error("handleStaticFile:", String(err));
+
+            return { statusCode: 404 };
+          }
+
+          filePath = `${publicPath}/${appName}.html`;
+        }
+      }
+
+      return { statusCode: 404 };
+    };
+  },
+});
+
+export default prodStaticFileRouteHandlerInjectable;
diff --git a/src/main/routes/files/static-file-route.injectable.ts b/src/main/routes/files/static-file-route.injectable.ts
new file mode 100644
index 0000000000..0268ac2051
--- /dev/null
+++ b/src/main/routes/files/static-file-route.injectable.ts
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getRouteInjectable } from "../../router/router.injectable";
+import isDevelopmentInjectable from "../../../common/vars/is-development.injectable";
+import { route } from "../../router/route";
+import prodStaticFileRouteHandlerInjectable from "./production.injectable";
+import devStaticFileRouteHandlerInjectable from "./development.injectable";
+
+const staticFileRouteInjectable = getRouteInjectable({
+  id: "static-file-route",
+
+  instantiate: (di) => {
+    const isDevelopment = di.inject(isDevelopmentInjectable);
+
+    return route({
+      method: "get",
+      path: `/{path*}`,
+    })(
+      isDevelopment
+        ? di.inject(devStaticFileRouteHandlerInjectable)
+        : di.inject(prodStaticFileRouteHandlerInjectable),
+    );
+  },
+});
+
+export default staticFileRouteInjectable;
diff --git a/src/main/routes/helm/charts/get-chart-route.injectable.ts b/src/main/routes/helm/charts/get-readme-route.injectable.ts
similarity index 58%
rename from src/main/routes/helm/charts/get-chart-route.injectable.ts
rename to src/main/routes/helm/charts/get-readme-route.injectable.ts
index 012584dbfc..f3b52073c2 100644
--- a/src/main/routes/helm/charts/get-chart-route.injectable.ts
+++ b/src/main/routes/helm/charts/get-readme-route.injectable.ts
@@ -5,22 +5,22 @@
 import { getRouteInjectable } from "../../../router/router.injectable";
 import { apiPrefix } from "../../../../common/vars";
 import { route } from "../../../router/route";
-import getHelmChartInjectable from "../../../helm/helm-service/get-helm-chart.injectable";
+import getHelmChartReadmeInjectable from "../../../helm/helm-service/get-helm-chart-readme.injectable";
 
-const getChartRouteInjectable = getRouteInjectable({
-  id: "get-chart-route",
+const getHelmChartReadmeRouteInjectable = getRouteInjectable({
+  id: "get-helm-chart-readme-route",
 
   instantiate: (di) => {
-    const getHelmChart = di.inject(getHelmChartInjectable);
+    const getHelmChartReadme = di.inject(getHelmChartReadmeInjectable);
 
     return route({
       method: "get",
-      path: `${apiPrefix}/v2/charts/{repo}/{chart}`,
+      path: `${apiPrefix}/v2/charts/{repo}/{chart}/readme`,
     })(async ({ params, query }) => {
       const { repo, chart } = params;
 
       return {
-        response: await getHelmChart(
+        response: await getHelmChartReadme(
           repo,
           chart,
           query.get("version") ?? undefined,
@@ -30,4 +30,4 @@ const getChartRouteInjectable = getRouteInjectable({
   },
 });
 
-export default getChartRouteInjectable;
+export default getHelmChartReadmeRouteInjectable;
diff --git a/src/main/routes/helm/charts/get-chart-values-route.injectable.ts b/src/main/routes/helm/charts/get-values-route.injectable.ts
similarity index 84%
rename from src/main/routes/helm/charts/get-chart-values-route.injectable.ts
rename to src/main/routes/helm/charts/get-values-route.injectable.ts
index 3cb7fd8f46..49efe5fb0c 100644
--- a/src/main/routes/helm/charts/get-chart-values-route.injectable.ts
+++ b/src/main/routes/helm/charts/get-values-route.injectable.ts
@@ -7,8 +7,8 @@ import { apiPrefix } from "../../../../common/vars";
 import { route } from "../../../router/route";
 import getHelmChartValuesInjectable from "../../../helm/helm-service/get-helm-chart-values.injectable";
 
-const getChartRouteValuesInjectable = getRouteInjectable({
-  id: "get-chart-route-values",
+const getHelmChartRouteValuesInjectable = getRouteInjectable({
+  id: "get-helm-chart-values-route",
 
   instantiate: (di) => {
     const getHelmChartValues = di.inject(getHelmChartValuesInjectable);
@@ -26,4 +26,4 @@ const getChartRouteValuesInjectable = getRouteInjectable({
   },
 });
 
-export default getChartRouteValuesInjectable;
+export default getHelmChartRouteValuesInjectable;
diff --git a/src/main/routes/helm/charts/get-versions-route.injectable.ts b/src/main/routes/helm/charts/get-versions-route.injectable.ts
new file mode 100644
index 0000000000..933d94743b
--- /dev/null
+++ b/src/main/routes/helm/charts/get-versions-route.injectable.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getRouteInjectable } from "../../../router/router.injectable";
+import { apiPrefix } from "../../../../common/vars";
+import { route } from "../../../router/route";
+import getHelmChartVersionsInjectable from "../../../helm/helm-service/get-helm-chart-versions.injectable";
+
+const getHelmChartVersionsRouteInjectable = getRouteInjectable({
+  id: "get-helm-chart-versions-route",
+
+  instantiate: (di) => {
+    const getHelmChartVersions = di.inject(getHelmChartVersionsInjectable);
+
+    return route({
+      method: "get",
+      path: `${apiPrefix}/v2/charts/{repo}/{chart}/versions`,
+    })(async ({ params: { repo, chart }}) => ({
+      response: await getHelmChartVersions(repo, chart),
+    }));
+  },
+});
+
+export default getHelmChartVersionsRouteInjectable;
diff --git a/src/main/routes/helm/charts/list-charts-route.injectable.ts b/src/main/routes/helm/charts/list-route.injectable.ts
similarity index 82%
rename from src/main/routes/helm/charts/list-charts-route.injectable.ts
rename to src/main/routes/helm/charts/list-route.injectable.ts
index 946b7fe022..402a3d7cd1 100644
--- a/src/main/routes/helm/charts/list-charts-route.injectable.ts
+++ b/src/main/routes/helm/charts/list-route.injectable.ts
@@ -7,8 +7,8 @@ import { apiPrefix } from "../../../../common/vars";
 import { route } from "../../../router/route";
 import listHelmChartsInjectable from "../../../helm/helm-service/list-helm-charts.injectable";
 
-const listChartsRouteInjectable = getRouteInjectable({
-  id: "list-charts-route",
+const listHelmChartsRouteInjectable = getRouteInjectable({
+  id: "list-helm-charts-route",
 
   instantiate: (di) => {
     const listHelmCharts = di.inject(listHelmChartsInjectable);
@@ -22,4 +22,4 @@ const listChartsRouteInjectable = getRouteInjectable({
   },
 });
 
-export default listChartsRouteInjectable;
+export default listHelmChartsRouteInjectable;
diff --git a/src/main/routes/helm/releases/update-release-route.injectable.ts b/src/main/routes/helm/releases/update-release-route.injectable.ts
index 573c85d962..5993d7922d 100644
--- a/src/main/routes/helm/releases/update-release-route.injectable.ts
+++ b/src/main/routes/helm/releases/update-release-route.injectable.ts
@@ -17,8 +17,8 @@ const updateChartArgsValidator = Joi.object<UpdateChartArgs, true, UpdateChartAr
     .string()
     .required(),
   values: Joi
-    .object()
-    .unknown(true),
+    .string()
+    .required(),
 });
 
 const updateReleaseRouteInjectable = getRouteInjectable({
diff --git a/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts b/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts
index 48bdc5f644..476ee983a3 100644
--- a/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts
+++ b/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts
@@ -9,6 +9,7 @@ import type { Cluster } from "../../../common/cluster/cluster";
 import type { V1Secret } from "@kubernetes/client-node";
 import { CoreV1Api } from "@kubernetes/client-node";
 import { clusterRoute } from "../../router/route";
+import { dump } from "js-yaml";
 
 const getServiceAccountRouteInjectable = getRouteInjectable({
   id: "get-service-account-route",
@@ -50,43 +51,15 @@ const getServiceAccountRouteInjectable = getRouteInjectable({
 
 export default getServiceAccountRouteInjectable;
 
-interface ServiceAccountKubeConfig {
-  apiVersion: string;
-  kind: string;
-  clusters: {
-    name: string;
-    cluster: {
-      server: string;
-      "certificate-authority-data": string;
-    };
-  }[];
-  users: {
-    name: string;
-    user: {
-      token: string;
-    };
-  }[];
-  contexts: {
-    name: string;
-    context: {
-      user: string;
-      cluster: string;
-      namespace: string | undefined;
-    };
-  }[];
-  "current-context": string;
-}
-
-function generateKubeConfig(username: string, secret: V1Secret, cluster: Cluster): ServiceAccountKubeConfig | undefined {
+function generateKubeConfig(username: string, secret: V1Secret, cluster: Cluster): string | undefined {
   if (!secret.data || !secret.metadata) {
     return undefined;
   }
 
   const { token, "ca.crt": caCrt } = secret.data;
-
   const tokenData = Buffer.from(token, "base64");
 
-  return {
+  return dump({
     "apiVersion": "v1",
     "kind": "Config",
     "clusters": [
@@ -117,5 +90,5 @@ function generateKubeConfig(username: string, secret: V1Secret, cluster: Cluster
       },
     ],
     "current-context": cluster.contextName,
-  };
+  });
 }
diff --git a/src/main/routes/metrics/add-metrics-route.injectable.ts b/src/main/routes/metrics/add-metrics-route.injectable.ts
index 5f97ddf4c3..a2c6a67d50 100644
--- a/src/main/routes/metrics/add-metrics-route.injectable.ts
+++ b/src/main/routes/metrics/add-metrics-route.injectable.ts
@@ -18,7 +18,7 @@ import getMetricsInjectable from "../../get-metrics.injectable";
 // This is used for backoff retry tracking.
 const ATTEMPTS = [false, false, false, false, true];
 
-const loadMetricsFor = (getMetrics: GetMetrics) => async (promQueries: string[], cluster: Cluster, prometheusPath: string, queryParams: Record<string, string>): Promise<any[]> => {
+const loadMetricsFor = (getMetrics: GetMetrics) => async (promQueries: string[], cluster: Cluster, prometheusPath: string, queryParams: Partial<Record<string, string>>): Promise<any[]> => {
   const queries = promQueries.map(p => p.trim());
   const loaders = new Map<string, Promise<any>>();
 
@@ -28,14 +28,17 @@ const loadMetricsFor = (getMetrics: GetMetrics) => async (promQueries: string[],
         try {
           return await getMetrics(cluster, prometheusPath, { query, ...queryParams });
         } catch (error) {
-          if (isRequestError(error)) {
-            if (lastAttempt || (error.statusCode && error.statusCode >= 400 && error.statusCode < 500)) {
-              throw new Error("Metrics not available", { cause: error });
-            }
-          } else if (error instanceof Error) {
+          if (
+            !isRequestError(error)
+            || lastAttempt
+            || (
+              !lastAttempt && (
+                typeof error.statusCode === "number" &&
+                400 <= error.statusCode && error.statusCode < 500
+              )
+            )
+          ) {
             throw new Error("Metrics not available", { cause: error });
-          } else {
-            throw new Error("Metrics not available");
           }
 
           await new Promise(resolve => setTimeout(resolve, (attempt + 1) * 1000)); // add delay before repeating request
@@ -59,13 +62,13 @@ const addMetricsRouteInjectable = getRouteInjectable({
     const getMetrics = di.inject(getMetricsInjectable);
     const loadMetrics = loadMetricsFor(getMetrics);
 
-    const queryParams = Object.fromEntries(query.entries());
+    const queryParams: Partial<Record<string, string>> = Object.fromEntries(query.entries());
     const prometheusMetadata: ClusterPrometheusMetadata = {};
 
     try {
       const { prometheusPath, provider } = await cluster.contextHandler.getPrometheusDetails();
 
-      prometheusMetadata.provider = provider?.id;
+      prometheusMetadata.provider = provider?.kind;
       prometheusMetadata.autoDetected = !cluster.preferences.prometheusProvider?.type;
 
       if (!prometheusPath) {
diff --git a/src/main/routes/metrics/get-metric-providers-route.injectable.ts b/src/main/routes/metrics/get-metric-providers-route.injectable.ts
index 22b2fbf11b..54dfd9bb95 100644
--- a/src/main/routes/metrics/get-metric-providers-route.injectable.ts
+++ b/src/main/routes/metrics/get-metric-providers-route.injectable.ts
@@ -6,23 +6,22 @@
 import { apiPrefix } from "../../../common/vars";
 import { getRouteInjectable } from "../../router/router.injectable";
 import { route } from "../../router/route";
-import prometheusProviderRegistryInjectable from "../../prometheus/prometheus-provider-registry.injectable";
+import prometheusProvidersInjectable from "../../prometheus/providers.injectable";
 
 const getMetricProvidersRouteInjectable = getRouteInjectable({
   id: "get-metric-providers-route",
 
   instantiate: (di) => {
-    const prometheusProviderRegistry = di.inject(prometheusProviderRegistryInjectable);
+    const prometheusProviders = di.inject(prometheusProvidersInjectable);
 
     return route({
       method: "get",
       path: `${apiPrefix}/metrics/providers`,
     })(() => ({
-      response: Array.from(
-        prometheusProviderRegistry
-          .providers
-          .values(),
-        ({ name, id, isConfigurable }) => ({ name, id, isConfigurable }),
+      response: (
+        prometheusProviders
+          .get()
+          .map(({ name, kind: id, isConfigurable }) => ({ name, id, isConfigurable }))
       ),
     }));
   },
diff --git a/src/main/routes/resource-applier/apply-resource-route.injectable.ts b/src/main/routes/resource-applier/apply-resource-route.injectable.ts
deleted file mode 100644
index 45f484fd3f..0000000000
--- a/src/main/routes/resource-applier/apply-resource-route.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getRouteInjectable } from "../../router/router.injectable";
-import { apiPrefix } from "../../../common/vars";
-import { ResourceApplier } from "../../resource-applier";
-import { clusterRoute } from "../../router/route";
-
-const applyResourceRouteInjectable = getRouteInjectable({
-  id: "apply-resource-route",
-
-  instantiate: () => clusterRoute({
-    method: "post",
-    path: `${apiPrefix}/stack`,
-  })(async ({ cluster, payload }) => ({
-    response: await new ResourceApplier(cluster).apply(payload),
-  })),
-});
-
-export default applyResourceRouteInjectable;
diff --git a/src/main/routes/resource-applier/create-resource-route.injectable.ts b/src/main/routes/resource-applier/create-resource-route.injectable.ts
new file mode 100644
index 0000000000..3b68201e9d
--- /dev/null
+++ b/src/main/routes/resource-applier/create-resource-route.injectable.ts
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getRouteInjectable } from "../../router/router.injectable";
+import { apiPrefix } from "../../../common/vars";
+import { payloadValidatedClusterRoute } from "../../router/route";
+import Joi from "joi";
+import createResourceApplierInjectable from "../../resource-applier/create-resource-applier.injectable";
+
+const createResourceRouteInjectable = getRouteInjectable({
+  id: "create-resource-route",
+
+  instantiate: (di) => {
+    const createResourceApplier = di.inject(createResourceApplierInjectable);
+
+    return payloadValidatedClusterRoute({
+      method: "post",
+      path: `${apiPrefix}/stack`,
+      payloadValidator: Joi.string(),
+    })(async ({ cluster, payload }) => ({
+      response: await createResourceApplier(cluster).create(payload),
+    }));
+  },
+});
+
+export default createResourceRouteInjectable;
diff --git a/src/main/routes/resource-applier/patch-resource-route.injectable.ts b/src/main/routes/resource-applier/patch-resource-route.injectable.ts
index 53506d6bb0..e962c18607 100644
--- a/src/main/routes/resource-applier/patch-resource-route.injectable.ts
+++ b/src/main/routes/resource-applier/patch-resource-route.injectable.ts
@@ -4,10 +4,10 @@
  */
 import { getRouteInjectable } from "../../router/router.injectable";
 import { apiPrefix } from "../../../common/vars";
-import { ResourceApplier } from "../../resource-applier";
 import { payloadValidatedClusterRoute } from "../../router/route";
 import Joi from "joi";
 import type { Patch } from "rfc6902";
+import createResourceApplierInjectable from "../../resource-applier/create-resource-applier.injectable";
 
 interface PatchResourcePayload {
   name: string;
@@ -40,18 +40,22 @@ const patchResourcePayloadValidator = Joi.object<PatchResourcePayload, true, Pat
 const patchResourceRouteInjectable = getRouteInjectable({
   id: "patch-resource-route",
 
-  instantiate: () => payloadValidatedClusterRoute({
-    method: "patch",
-    path: `${apiPrefix}/stack`,
-    payloadValidator: patchResourcePayloadValidator,
-  })(async ({ cluster, payload }) => ({
-    response: await new ResourceApplier(cluster).patch(
-      payload.name,
-      payload.kind,
-      payload.patch,
-      payload.ns,
-    ),
-  })),
+  instantiate: (di) => {
+    const createResourceApplier = di.inject(createResourceApplierInjectable);
+
+    return payloadValidatedClusterRoute({
+      method: "patch",
+      path: `${apiPrefix}/stack`,
+      payloadValidator: patchResourcePayloadValidator,
+    })(async ({ cluster, payload }) => ({
+      response: await createResourceApplier(cluster).patch(
+        payload.name,
+        payload.kind,
+        payload.patch,
+        payload.ns,
+      ),
+    }));
+  },
 });
 
 export default patchResourceRouteInjectable;
diff --git a/src/main/routes/static-file-route.injectable.ts b/src/main/routes/static-file-route.injectable.ts
deleted file mode 100644
index 86fa4b2fc5..0000000000
--- a/src/main/routes/static-file-route.injectable.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import type { SupportedFileExtension } from "../router/router-content-types";
-import { contentTypes } from "../router/router-content-types";
-import logger from "../logger";
-import { getRouteInjectable } from "../router/router.injectable";
-import { appName, publicPath } from "../../common/vars";
-import path from "path";
-import isDevelopmentInjectable from "../../common/vars/is-development.injectable";
-import httpProxy from "http-proxy";
-import readFileBufferInjectable from "../../common/fs/read-file-buffer.injectable";
-import type { GetAbsolutePath } from "../../common/path/get-absolute-path.injectable";
-import getAbsolutePathInjectable from "../../common/path/get-absolute-path.injectable";
-import type { JoinPaths } from "../../common/path/join-paths.injectable";
-import joinPathsInjectable from "../../common/path/join-paths.injectable";
-import { webpackDevServerPort } from "../../../webpack/vars";
-import type { LensApiRequest, RouteResponse } from "../router/route";
-import { route } from "../router/route";
-import staticFilesDirectoryInjectable from "../../common/vars/static-files-directory.injectable";
-
-interface ProductionDependencies {
-  readFileBuffer: (path: string) => Promise<Buffer>;
-  getAbsolutePath: GetAbsolutePath;
-  joinPaths: JoinPaths;
-  staticFilesDirectory: string;
-}
-
-const handleStaticFileInProduction =
-  ({ readFileBuffer, getAbsolutePath, joinPaths, staticFilesDirectory }: ProductionDependencies) =>
-    async ({ params }: LensApiRequest<"/{path*}">): Promise<RouteResponse<Buffer>> => {
-      let filePath = params.path;
-
-      for (let retryCount = 0; retryCount < 5; retryCount += 1) {
-        const asset = joinPaths(staticFilesDirectory, filePath);
-        const normalizedFilePath = getAbsolutePath(asset);
-
-        if (!normalizedFilePath.startsWith(staticFilesDirectory)) {
-          return { statusCode: 404 };
-        }
-
-        try {
-          const fileExtension = path
-            .extname(asset)
-            .slice(1) as SupportedFileExtension;
-
-          const contentType = contentTypes[fileExtension] || contentTypes.txt;
-
-          return { response: await readFileBuffer(asset), contentType };
-        } catch (err) {
-          if (retryCount > 5) {
-            logger.error("handleStaticFile:", String(err));
-
-            return { statusCode: 404 };
-          }
-
-          filePath = `${publicPath}/${appName}.html`;
-        }
-      }
-
-      return { statusCode: 404 };
-    };
-
-interface DevelopmentDependencies {
-  proxy: httpProxy;
-}
-
-const handleStaticFileInDevelopment =
-  ({ proxy }: DevelopmentDependencies) =>
-    ({ raw: { req, res }}: LensApiRequest<"/{path*}">): RouteResponse<Buffer> => {
-      if (req.url === "/" || !req.url?.startsWith("/build/")) {
-        req.url = `${publicPath}/${appName}.html`;
-      }
-
-      proxy.web(req, res, {
-        target: `http://127.0.0.1:${webpackDevServerPort}`,
-      });
-
-      return { proxy };
-    };
-
-const staticFileRouteInjectable = getRouteInjectable({
-  id: "static-file-route",
-
-  instantiate: (di) => {
-    const isDevelopment = di.inject(isDevelopmentInjectable);
-    const readFileBuffer = di.inject(readFileBufferInjectable);
-    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
-    const joinPaths = di.inject(joinPathsInjectable);
-    const staticFilesDirectory = di.inject(staticFilesDirectoryInjectable);
-
-    return route({
-      method: "get",
-      path: `/{path*}`,
-    })(
-      isDevelopment
-        ? handleStaticFileInDevelopment({
-          proxy: httpProxy.createProxy(),
-        })
-        : handleStaticFileInProduction({
-          readFileBuffer,
-          getAbsolutePath,
-          joinPaths,
-          staticFilesDirectory,
-        }),
-    );
-  },
-});
-
-export default staticFileRouteInjectable;
diff --git a/src/main/routes/versions/get-version-route.injectable.ts b/src/main/routes/versions/get-version-route.injectable.ts
index aa846c171c..d132e242d6 100644
--- a/src/main/routes/versions/get-version-route.injectable.ts
+++ b/src/main/routes/versions/get-version-route.injectable.ts
@@ -3,20 +3,24 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getRouteInjectable } from "../../router/router.injectable";
-import { getAppVersion } from "../../../common/utils";
 import { route } from "../../router/route";
+import buildVersionInjectable from "../../vars/build-version/build-version.injectable";
 
 const getVersionRouteInjectable = getRouteInjectable({
   id: "get-version-route",
 
-  instantiate: () => route({
-    method: "get",
-    path: `/version`,
-  })(() => ({
-    response: {
-      version: getAppVersion(),
-    },
-  })),
+  instantiate: (di) => {
+    const buildVersion = di.inject(buildVersionInjectable);
+
+    return route({
+      method: "get",
+      path: `/version`,
+    })(() => ({
+      response: {
+        version: buildVersion.get(),
+      },
+    }));
+  },
 });
 
 export default getVersionRouteInjectable;
diff --git a/src/main/shell-session/create-shell-session.injectable.ts b/src/main/shell-session/create-shell-session.injectable.ts
index 5bd5569053..49ba44cb67 100644
--- a/src/main/shell-session/create-shell-session.injectable.ts
+++ b/src/main/shell-session/create-shell-session.injectable.ts
@@ -5,25 +5,30 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { Cluster } from "../../common/cluster/cluster";
 import type WebSocket from "ws";
-import localShellSessionInjectable from "./local-shell-session/local-shell-session.injectable";
-import nodeShellSessionInjectable from "./node-shell-session/node-shell-session.injectable";
+import openLocalShellSessionInjectable from "./local-shell-session/open.injectable";
+import openNodeShellSessionInjectable from "./node-shell-session/open.injectable";
 
-interface Args {
-  webSocket: WebSocket;
+export interface OpenShellSessionArgs {
+  websocket: WebSocket;
   cluster: Cluster;
   tabId: string;
   nodeName?: string;
 }
 
-const createShellSessionInjectable = getInjectable({
-  id: "create-shell-session",
+export type OpenShellSession = (args: OpenShellSessionArgs) => Promise<void>;
 
-  instantiate:
-    (di) =>
-      ({ nodeName, ...rest }: Args) =>
-        !nodeName
-          ? di.inject(localShellSessionInjectable, rest)
-          : di.inject(nodeShellSessionInjectable, { nodeName, ...rest }),
+const openShellSessionInjectable = getInjectable({
+  id: "open-shell-session",
+
+  instantiate: (di): OpenShellSession => {
+    const openLocalShellSession = di.inject(openLocalShellSessionInjectable);
+
+    return ({ nodeName, ...args }) => (
+      nodeName
+        ? di.inject(openNodeShellSessionInjectable, { nodeName, ...args })
+        : openLocalShellSession(args)
+    );
+  },
 });
 
-export default createShellSessionInjectable;
+export default openShellSessionInjectable;
diff --git a/src/main/shell-session/local-shell-session/local-shell-session.injectable.ts b/src/main/shell-session/local-shell-session/local-shell-session.injectable.ts
deleted file mode 100644
index ed9b86819b..0000000000
--- a/src/main/shell-session/local-shell-session/local-shell-session.injectable.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
-import { LocalShellSession } from "./local-shell-session";
-import type { Cluster } from "../../../common/cluster/cluster";
-import type WebSocket from "ws";
-import createKubectlInjectable from "../../kubectl/create-kubectl.injectable";
-import terminalShellEnvModifiersInjectable from "../shell-env-modifier/terminal-shell-env-modify.injectable";
-
-interface InstantiationParameter {
-  webSocket: WebSocket;
-  cluster: Cluster;
-  tabId: string;
-}
-
-const localShellSessionInjectable = getInjectable({
-  id: "local-shell-session",
-
-  instantiate: (di, { cluster, tabId, webSocket }: InstantiationParameter) => {
-    const createKubectl = di.inject(createKubectlInjectable);
-    const localShellEnvModify = di.inject(terminalShellEnvModifiersInjectable);
-
-    const kubectl = createKubectl(cluster.version);
-
-    return new LocalShellSession(localShellEnvModify, kubectl, webSocket, cluster, tabId);
-  },
-
-  lifecycle: lifecycleEnum.transient,
-});
-
-export default localShellSessionInjectable;
diff --git a/src/main/shell-session/local-shell-session/local-shell-session.ts b/src/main/shell-session/local-shell-session/local-shell-session.ts
index 9f42c7f242..49e6dd059f 100644
--- a/src/main/shell-session/local-shell-session/local-shell-session.ts
+++ b/src/main/shell-session/local-shell-session/local-shell-session.ts
@@ -3,24 +3,32 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type WebSocket from "ws";
-import path from "path";
-import { UserStore } from "../../../common/user-store";
-import type { Cluster } from "../../../common/cluster/cluster";
-import type { ClusterId } from "../../../common/cluster-types";
+import type { UserStore } from "../../../common/user-store";
+import type { ShellSessionArgs, ShellSessionDependencies } from "../shell-session";
 import { ShellSession } from "../shell-session";
-import type { Kubectl } from "../../kubectl/kubectl";
-import { baseBinariesDir } from "../../../common/vars";
+import type { ModifyTerminalShellEnv } from "../shell-env-modifier/modify-terminal-shell-env.injectable";
+import type { JoinPaths } from "../../../common/path/join-paths.injectable";
+import type { GetDirnameOfPath } from "../../../common/path/get-dirname.injectable";
+import type { GetBasenameOfPath } from "../../../common/path/get-basename.injectable";
+
+export interface LocalShellSessionDependencies extends ShellSessionDependencies {
+  readonly directoryForBinaries: string;
+  readonly userStore: UserStore;
+  modifyTerminalShellEnv: ModifyTerminalShellEnv;
+  joinPaths: JoinPaths;
+  getDirnameOfPath: GetDirnameOfPath;
+  getBasenameOfPath: GetBasenameOfPath;
+}
 
 export class LocalShellSession extends ShellSession {
   ShellType = "shell";
 
-  constructor(protected shellEnvModify: (clusterId: ClusterId, env: Record<string, string | undefined>) => Record<string, string | undefined>, kubectl: Kubectl, websocket: WebSocket, cluster: Cluster, terminalId: string) {
-    super(kubectl, websocket, cluster, terminalId);
+  constructor(protected readonly dependencies: LocalShellSessionDependencies, args: ShellSessionArgs) {
+    super(dependencies, args);
   }
 
   protected getPathEntries(): string[] {
-    return [baseBinariesDir.get()];
+    return [this.dependencies.directoryForBinaries];
   }
 
   protected get cwd(): string | undefined {
@@ -28,11 +36,8 @@ export class LocalShellSession extends ShellSession {
   }
 
   public async open() {
-    let env = await this.getCachedShellEnv();
-
     // extensions can modify the env
-    env = this.shellEnvModify(this.cluster.id, env);
-
+    const env = this.dependencies.modifyTerminalShellEnv(this.cluster.id, await this.getCachedShellEnv());
     const shell = env.PTYSHELL;
 
     if (!shell) {
@@ -45,16 +50,18 @@ export class LocalShellSession extends ShellSession {
   }
 
   protected async getShellArgs(shell: string): Promise<string[]> {
-    const pathFromPreferences = UserStore.getInstance().kubectlBinariesPath || this.kubectl.getBundledPath();
-    const kubectlPathDir = UserStore.getInstance().downloadKubectlBinaries ? await this.kubectlBinDirP : path.dirname(pathFromPreferences);
+    const pathFromPreferences = this.dependencies.userStore.kubectlBinariesPath || this.kubectl.getBundledPath();
+    const kubectlPathDir = this.dependencies.userStore.downloadKubectlBinaries
+      ? await this.kubectlBinDirP
+      : this.dependencies.getDirnameOfPath(pathFromPreferences);
 
-    switch(path.basename(shell)) {
+    switch(this.dependencies.getBasenameOfPath(shell)) {
       case "powershell.exe":
-        return ["-NoExit", "-command", `& {$Env:PATH="${kubectlPathDir};${baseBinariesDir.get()};$Env:PATH"}`];
+        return ["-NoExit", "-command", `& {$Env:PATH="${kubectlPathDir};${this.dependencies.directoryForBinaries};$Env:PATH"}`];
       case "bash":
-        return ["--init-file", path.join(await this.kubectlBinDirP, ".bash_set_path")];
+        return ["--init-file", this.dependencies.joinPaths(await this.kubectlBinDirP, ".bash_set_path")];
       case "fish":
-        return ["--login", "--init-command", `export PATH="${kubectlPathDir}:${baseBinariesDir.get()}:$PATH"; export KUBECONFIG="${await this.kubeconfigPathP}"`];
+        return ["--login", "--init-command", `export PATH="${kubectlPathDir}:${this.dependencies.directoryForBinaries}:$PATH"; export KUBECONFIG="${await this.kubeconfigPathP}"`];
       case "zsh":
         return ["--login"];
       default:
diff --git a/src/main/shell-session/local-shell-session/open.injectable.ts b/src/main/shell-session/local-shell-session/open.injectable.ts
new file mode 100644
index 0000000000..113f4824c5
--- /dev/null
+++ b/src/main/shell-session/local-shell-session/open.injectable.ts
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { LocalShellSessionDependencies } from "./local-shell-session";
+import { LocalShellSession } from "./local-shell-session";
+import createKubectlInjectable from "../../kubectl/create-kubectl.injectable";
+import modifyTerminalShellEnvInjectable from "../shell-env-modifier/modify-terminal-shell-env.injectable";
+import directoryForBinariesInjectable from "../../../common/app-paths/directory-for-binaries/directory-for-binaries.injectable";
+import isMacInjectable from "../../../common/vars/is-mac.injectable";
+import type { Cluster } from "../../../common/cluster/cluster";
+import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
+import userStoreInjectable from "../../../common/user-store/user-store.injectable";
+import type WebSocket from "ws";
+import getDirnameOfPathInjectable from "../../../common/path/get-dirname.injectable";
+import joinPathsInjectable from "../../../common/path/join-paths.injectable";
+import getBasenameOfPathInjectable from "../../../common/path/get-basename.injectable";
+import computeShellEnvironmentInjectable from "../../../features/shell-sync/main/compute-shell-environment.injectable";
+import spawnPtyInjectable from "../spawn-pty.injectable";
+import userShellSettingInjectable from "../../../common/user-store/shell-setting.injectable";
+import appNameInjectable from "../../../common/vars/app-name.injectable";
+import buildVersionInjectable from "../../vars/build-version/build-version.injectable";
+import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
+import statInjectable from "../../../common/fs/stat/stat.injectable";
+
+export interface OpenLocalShellSessionArgs {
+  websocket: WebSocket;
+  cluster: Cluster;
+  tabId: string;
+}
+
+export type OpenLocalShellSession = (args: OpenLocalShellSessionArgs) => Promise<void>;
+
+const openLocalShellSessionInjectable = getInjectable({
+  id: "open-local-shell-session",
+
+  instantiate: (di): OpenLocalShellSession => {
+    const createKubectl = di.inject(createKubectlInjectable);
+    const dependencies: LocalShellSessionDependencies = {
+      directoryForBinaries: di.inject(directoryForBinariesInjectable),
+      isMac: di.inject(isMacInjectable),
+      isWindows: di.inject(isWindowsInjectable),
+      logger: di.inject(loggerInjectable),
+      userStore: di.inject(userStoreInjectable),
+      userShellSetting: di.inject(userShellSettingInjectable),
+      appName: di.inject(appNameInjectable),
+      buildVersion: di.inject(buildVersionInjectable),
+      modifyTerminalShellEnv: di.inject(modifyTerminalShellEnvInjectable),
+      emitAppEvent: di.inject(emitAppEventInjectable),
+      getDirnameOfPath: di.inject(getDirnameOfPathInjectable),
+      joinPaths: di.inject(joinPathsInjectable),
+      getBasenameOfPath: di.inject(getBasenameOfPathInjectable),
+      computeShellEnvironment: di.inject(computeShellEnvironmentInjectable),
+      spawnPty: di.inject(spawnPtyInjectable),
+      stat: di.inject(statInjectable),
+    };
+
+    return (args) => {
+      const kubectl = createKubectl(args.cluster.version);
+      const session = new LocalShellSession(dependencies, { kubectl, ...args });
+
+      return session.open();
+    };
+  },
+});
+
+export default openLocalShellSessionInjectable;
diff --git a/src/main/shell-session/local-shell-session/techincal.test.ts b/src/main/shell-session/local-shell-session/techincal.test.ts
new file mode 100644
index 0000000000..fbe2ccaea3
--- /dev/null
+++ b/src/main/shell-session/local-shell-session/techincal.test.ts
@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { DiContainer } from "@ogre-tools/injectable";
+import { WebSocket } from "ws";
+import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import type { Cluster } from "../../../common/cluster/cluster";
+import platformInjectable from "../../../common/vars/platform.injectable";
+import { getDiForUnitTesting } from "../../getDiForUnitTesting";
+import createKubectlInjectable from "../../kubectl/create-kubectl.injectable";
+import type { Kubectl } from "../../kubectl/kubectl";
+import buildVersionInjectable from "../../vars/build-version/build-version.injectable";
+import type { OpenShellSession } from "../create-shell-session.injectable";
+import type { SpawnPty } from "../spawn-pty.injectable";
+import spawnPtyInjectable from "../spawn-pty.injectable";
+import openLocalShellSessionInjectable from "./open.injectable";
+
+describe("technical unit tests for local shell sessions", () => {
+  let di: DiContainer;
+
+  beforeEach(() => {
+    di = getDiForUnitTesting({
+      doGeneralOverrides: true,
+    });
+
+    di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data");
+    di.override(buildVersionInjectable, () => ({
+      get: () => "1.1.1",
+    }));
+  });
+
+  describe("when on windows", () => {
+    let openLocalShellSession: OpenShellSession;
+    let spawnPtyMock: jest.MockedFunction<SpawnPty>;
+
+    beforeEach(() => {
+      di.override(platformInjectable, () => "win32");
+
+      spawnPtyMock = jest.fn();
+      di.override(spawnPtyInjectable, () => spawnPtyMock);
+
+      di.override(createKubectlInjectable, () => () => ({
+        binDir: async () => "/some-kubectl-binary-dir",
+        getBundledPath: () => "/some-bundled-kubectl-path",
+      }) as Partial<Kubectl> as Kubectl);
+
+      openLocalShellSession = di.inject(openLocalShellSessionInjectable);
+    });
+
+    describe("when opening a local shell session", () => {
+      it("should pass through all environment variables to shell", async () => {
+        process.env.MY_TEST_ENV_VAR = "true";
+
+        spawnPtyMock.mockImplementationOnce((file, args, options) => {
+          expect(options.env).toMatchObject({
+            MY_TEST_ENV_VAR: "true",
+          });
+
+          return {
+            cols: 80,
+            rows: 40,
+            pid: 12343,
+            handleFlowControl: false,
+            kill: jest.fn(),
+            onData: jest.fn(),
+            onExit: jest.fn(),
+            pause: jest.fn(),
+            process: "my-pty",
+            resize: jest.fn(),
+            resume: jest.fn(),
+            write: jest.fn(),
+            on: jest.fn(),
+
+          };
+        });
+
+        await openLocalShellSession({
+          cluster: {
+            getProxyKubeconfigPath: async () => "/some-proxy-kubeconfig",
+            preferences: {},
+          } as Partial<Cluster> as Cluster,
+          tabId: "my-tab-id",
+          websocket: new WebSocket(null),
+        });
+      });
+    });
+  });
+});
diff --git a/src/main/shell-session/node-shell-session/node-shell-session.injectable.ts b/src/main/shell-session/node-shell-session/node-shell-session.injectable.ts
deleted file mode 100644
index e2514708e6..0000000000
--- a/src/main/shell-session/node-shell-session/node-shell-session.injectable.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
-import type { Cluster } from "../../../common/cluster/cluster";
-import type WebSocket from "ws";
-import createKubectlInjectable from "../../kubectl/create-kubectl.injectable";
-import { NodeShellSession } from "./node-shell-session";
-
-interface InstantiationParameter {
-  webSocket: WebSocket;
-  cluster: Cluster;
-  tabId: string;
-  nodeName: string;
-}
-
-const nodeShellSessionInjectable = getInjectable({
-  id: "node-shell-session",
-
-  instantiate: (di, { cluster, tabId, webSocket, nodeName }: InstantiationParameter) => {
-    const createKubectl = di.inject(createKubectlInjectable);
-
-    const kubectl = createKubectl(cluster.version);
-
-    return new NodeShellSession(nodeName, kubectl, webSocket, cluster, tabId);
-  },
-
-  lifecycle: lifecycleEnum.transient,
-});
-
-export default nodeShellSessionInjectable;
diff --git a/src/main/shell-session/node-shell-session/node-shell-session.ts b/src/main/shell-session/node-shell-session/node-shell-session.ts
index 4c619a612c..6a8af4c09e 100644
--- a/src/main/shell-session/node-shell-session/node-shell-session.ts
+++ b/src/main/shell-session/node-shell-session/node-shell-session.ts
@@ -3,28 +3,34 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type WebSocket from "ws";
 import { v4 as uuid } from "uuid";
 import { Watch, CoreV1Api } from "@kubernetes/client-node";
 import type { KubeConfig } from "@kubernetes/client-node";
-import type { Cluster } from "../../../common/cluster/cluster";
+import type { ShellSessionArgs, ShellSessionDependencies } from "../shell-session";
 import { ShellOpenError, ShellSession } from "../shell-session";
 import { get, once } from "lodash";
 import { Node, NodeApi } from "../../../common/k8s-api/endpoints";
-import { KubeJsonApi } from "../../../common/k8s-api/kube-json-api";
-import logger from "../../logger";
-import type { Kubectl } from "../../kubectl/kubectl";
 import { TerminalChannels } from "../../../common/terminal/channels";
+import type { CreateKubeJsonApiForCluster } from "../../../common/k8s-api/create-kube-json-api-for-cluster.injectable";
+
+export interface NodeShellSessionArgs extends ShellSessionArgs {
+  nodeName: string;
+}
+
+export interface NodeShellSessionDependencies extends ShellSessionDependencies {
+  createKubeJsonApiForCluster: CreateKubeJsonApiForCluster;
+}
 
 export class NodeShellSession extends ShellSession {
   ShellType = "node-shell";
 
   protected readonly podName = `node-shell-${uuid()}`;
-
+  protected readonly nodeName: string;
   protected readonly cwd: string | undefined = undefined;
 
-  constructor(protected nodeName: string, kubectl: Kubectl, socket: WebSocket, cluster: Cluster, terminalId: string) {
-    super(kubectl, socket, cluster, terminalId);
+  constructor(protected readonly dependencies: NodeShellSessionDependencies, { nodeName, ...args }: NodeShellSessionArgs) {
+    super(dependencies, args);
+    this.nodeName = nodeName;
   }
 
   public async open() {
@@ -35,7 +41,7 @@ export class NodeShellSession extends ShellSession {
     const cleanup = once(() => {
       coreApi
         .deleteNamespacedPod(this.podName, "kube-system")
-        .catch(error => logger.warn(`[NODE-SHELL]: failed to remove pod shell`, error));
+        .catch(error => this.dependencies.logger.warn(`[NODE-SHELL]: failed to remove pod shell`, error));
     });
 
     this.websocket.once("close", cleanup);
@@ -63,7 +69,7 @@ export class NodeShellSession extends ShellSession {
     const args = ["exec", "-i", "-t", "-n", "kube-system", this.podName, "--"];
     const nodeApi = new NodeApi({
       objectConstructor: Node,
-      request: KubeJsonApi.forCluster(this.cluster.id),
+      request: this.dependencies.createKubeJsonApiForCluster(this.cluster.id),
     });
     const node = await nodeApi.get({ name: this.nodeName });
 
@@ -75,7 +81,7 @@ export class NodeShellSession extends ShellSession {
 
     switch (nodeOs) {
       default:
-        logger.warn(`[NODE-SHELL-SESSION]: could not determine node OS, falling back with assumption of linux`);
+        this.dependencies.logger.warn(`[NODE-SHELL-SESSION]: could not determine node OS, falling back with assumption of linux`);
         // fallthrough
       case "linux":
         args.push("sh", "-c", "((clear && bash) || (clear && ash) || (clear && sh))");
@@ -127,7 +133,7 @@ export class NodeShellSession extends ShellSession {
   }
 
   protected waitForRunningPod(kc: KubeConfig): Promise<void> {
-    logger.debug(`[NODE-SHELL]: waiting for ${this.podName} to be running`);
+    this.dependencies.logger.debug(`[NODE-SHELL]: waiting for ${this.podName} to be running`);
 
     return new Promise((resolve, reject) => {
       new Watch(kc)
@@ -146,19 +152,19 @@ export class NodeShellSession extends ShellSession {
           },
           // done callback is called if the watch terminates normally
           (err) => {
-            logger.error(`[NODE-SHELL]: ${this.podName} was not created in time`);
+            this.dependencies.logger.error(`[NODE-SHELL]: ${this.podName} was not created in time`);
             reject(err);
           },
         )
         .then(req => {
           setTimeout(() => {
-            logger.error(`[NODE-SHELL]: aborting wait for ${this.podName}, timing out`);
+            this.dependencies.logger.error(`[NODE-SHELL]: aborting wait for ${this.podName}, timing out`);
             req.abort();
             reject("Pod creation timed out");
           }, 2 * 60 * 1000); // 2 * 60 * 1000
         })
         .catch(error => {
-          logger.error(`[NODE-SHELL]: waiting for ${this.podName} failed: ${error}`);
+          this.dependencies.logger.error(`[NODE-SHELL]: waiting for ${this.podName} failed: ${error}`);
           reject(error);
         });
     });
diff --git a/src/main/shell-session/node-shell-session/open.injectable.ts b/src/main/shell-session/node-shell-session/open.injectable.ts
new file mode 100644
index 0000000000..797333a2ce
--- /dev/null
+++ b/src/main/shell-session/node-shell-session/open.injectable.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import type { Cluster } from "../../../common/cluster/cluster";
+import type WebSocket from "ws";
+import createKubectlInjectable from "../../kubectl/create-kubectl.injectable";
+import type { NodeShellSessionDependencies } from "./node-shell-session";
+import { NodeShellSession } from "./node-shell-session";
+import isMacInjectable from "../../../common/vars/is-mac.injectable";
+import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
+import createKubeJsonApiForClusterInjectable from "../../../common/k8s-api/create-kube-json-api-for-cluster.injectable";
+import computeShellEnvironmentInjectable from "../../../features/shell-sync/main/compute-shell-environment.injectable";
+import spawnPtyInjectable from "../spawn-pty.injectable";
+import userShellSettingInjectable from "../../../common/user-store/shell-setting.injectable";
+import appNameInjectable from "../../../common/vars/app-name.injectable";
+import buildVersionInjectable from "../../vars/build-version/build-version.injectable";
+import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
+import statInjectable from "../../../common/fs/stat/stat.injectable";
+
+export interface NodeShellSessionArgs {
+  websocket: WebSocket;
+  cluster: Cluster;
+  tabId: string;
+  nodeName: string;
+}
+
+const openNodeShellSessionInjectable = getInjectable({
+  id: "open-node-shell-session",
+  instantiate: (di, params: NodeShellSessionArgs) => {
+    const createKubectl = di.inject(createKubectlInjectable);
+    const dependencies: NodeShellSessionDependencies = {
+      isMac: di.inject(isMacInjectable),
+      isWindows: di.inject(isWindowsInjectable),
+      logger: di.inject(loggerInjectable),
+      userShellSetting: di.inject(userShellSettingInjectable),
+      appName: di.inject(appNameInjectable),
+      buildVersion: di.inject(buildVersionInjectable),
+      createKubeJsonApiForCluster: di.inject(createKubeJsonApiForClusterInjectable),
+      computeShellEnvironment: di.inject(computeShellEnvironmentInjectable),
+      spawnPty: di.inject(spawnPtyInjectable),
+      emitAppEvent: di.inject(emitAppEventInjectable),
+      stat: di.inject(statInjectable),
+    };
+    const kubectl = createKubectl(params.cluster.version);
+    const session = new NodeShellSession(dependencies, { kubectl, ...params });
+
+    return session.open();
+  },
+  // NOTE: this must be transient to bypass the circular dependency of `createKubeJsonApiForClusterInjectable` on the lens proxy port
+  lifecycle: lifecycleEnum.transient,
+});
+
+export default openNodeShellSessionInjectable;
diff --git a/src/main/shell-session/shell-env-modifier/modify-terminal-shell-env.injectable.ts b/src/main/shell-session/shell-env-modifier/modify-terminal-shell-env.injectable.ts
new file mode 100644
index 0000000000..559dbcf645
--- /dev/null
+++ b/src/main/shell-session/shell-env-modifier/modify-terminal-shell-env.injectable.ts
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import type { ClusterId } from "../../../common/cluster-types";
+import { isDefined } from "../../../common/utils";
+import mainExtensionsInjectable from "../../../extensions/main-extensions.injectable";
+import catalogEntityRegistryInjectable from "../../catalog/entity-registry.injectable";
+
+export type ModifyTerminalShellEnv = (clusterId: ClusterId, env: Partial<Record<string, string>>) => Partial<Record<string, string>>;
+
+const modifyTerminalShellEnvInjectable = getInjectable({
+  id: "terminal-shell-env-modify",
+
+  instantiate: (di): ModifyTerminalShellEnv => {
+    const extensions = di.inject(mainExtensionsInjectable);
+    const catalogEntityRegistry = di.inject(catalogEntityRegistryInjectable);
+    const terminalShellEnvModifiers = computed(() => (
+      extensions.get()
+        .map((extension) => extension.terminalShellEnvModifier)
+        .filter(isDefined)
+    ));
+
+    return (clusterId, env) => {
+      const modifiers = terminalShellEnvModifiers.get();
+
+      if (modifiers.length === 0) {
+        return env;
+      }
+
+      const entity = catalogEntityRegistry.findById(clusterId);
+
+      if (entity) {
+        const ctx = { catalogEntity: entity };
+
+        // clone it so the passed value is not also modified
+        env = JSON.parse(JSON.stringify(env));
+        env = modifiers.reduce((env, modifier) => modifier(ctx, env), env);
+      }
+
+      return env;
+    };
+  },
+});
+
+export default modifyTerminalShellEnvInjectable;
diff --git a/src/main/shell-session/shell-env-modifier/terminal-shell-env-modifiers.ts b/src/main/shell-session/shell-env-modifier/terminal-shell-env-modifiers.ts
deleted file mode 100644
index bf6a290052..0000000000
--- a/src/main/shell-session/shell-env-modifier/terminal-shell-env-modifiers.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { IComputedValue } from "mobx";
-import { computed } from "mobx";
-import type { ClusterId } from "../../../common/cluster-types";
-import { isDefined } from "../../../common/utils";
-import type { LensMainExtension } from "../../../extensions/lens-main-extension";
-import type { CatalogEntityRegistry } from "../../catalog";
-
-interface Dependencies {
-  extensions: IComputedValue<LensMainExtension[]>;
-  catalogEntityRegistry: CatalogEntityRegistry;
-}
-
-export const terminalShellEnvModify = ({ extensions, catalogEntityRegistry }: Dependencies) =>
-  (clusterId: ClusterId, env: Record<string, string | undefined>) => {
-    const terminalShellEnvModifiers = computed(() => (
-      extensions.get()
-        .map((extension) => extension.terminalShellEnvModifier)
-        .filter(isDefined)
-    ))
-      .get();
-
-    if (terminalShellEnvModifiers.length === 0) {
-      return env;
-    }
-
-    const entity = catalogEntityRegistry.findById(clusterId);
-
-    if (entity) {
-      const ctx = { catalogEntity: entity };
-
-      // clone it so the passed value is not also modified
-      env = JSON.parse(JSON.stringify(env));
-      env = terminalShellEnvModifiers.reduce((env, modifier) => modifier(ctx, env), env);
-    }
-
-    return env;
-  };
diff --git a/src/main/shell-session/shell-env-modifier/terminal-shell-env-modify.injectable.ts b/src/main/shell-session/shell-env-modifier/terminal-shell-env-modify.injectable.ts
deleted file mode 100644
index 7d8cb37a1c..0000000000
--- a/src/main/shell-session/shell-env-modifier/terminal-shell-env-modify.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { getInjectable } from "@ogre-tools/injectable";
-import mainExtensionsInjectable from "../../../extensions/main-extensions.injectable";
-import { terminalShellEnvModify } from "./terminal-shell-env-modifiers";
-import catalogEntityRegistryInjectable from "../../catalog/entity-registry.injectable";
-
-const terminalShellEnvModifyInjectable = getInjectable({
-  id: "terminal-shell-env-modify",
-
-  instantiate: (di) =>
-    terminalShellEnvModify({
-      extensions: di.inject(mainExtensionsInjectable),
-      catalogEntityRegistry: di.inject(catalogEntityRegistryInjectable),
-    }),
-});
-
-export default terminalShellEnvModifyInjectable;
diff --git a/src/main/shell-session/shell-session.ts b/src/main/shell-session/shell-session.ts
index 42286ee24d..d47cd676d5 100644
--- a/src/main/shell-session/shell-session.ts
+++ b/src/main/shell-session/shell-session.ts
@@ -6,19 +6,19 @@
 import type { Cluster } from "../../common/cluster/cluster";
 import type { Kubectl } from "../kubectl/kubectl";
 import type WebSocket from "ws";
-import { shellEnv } from "../utils/shell-env";
-import { app } from "electron";
 import { clearKubeconfigEnvVars } from "../utils/clear-kube-env-vars";
 import path from "path";
 import os from "os";
-import { isMac, isWindows } from "../../common/vars";
-import { UserStore } from "../../common/user-store";
-import * as pty from "node-pty";
-import { appEventBus } from "../../common/app-event-bus/event-bus";
-import logger from "../logger";
-import { stat } from "fs/promises";
+import type * as pty from "node-pty";
 import { getOrInsertWith } from "../../common/utils";
 import { type TerminalMessage, TerminalChannels } from "../../common/terminal/channels";
+import type { Logger } from "../../common/logger";
+import type { ComputeShellEnvironment } from "../../features/shell-sync/main/compute-shell-environment.injectable";
+import type { SpawnPty } from "./spawn-pty.injectable";
+import type { InitializableState } from "../../common/initializable-state/create";
+import type { EmitAppEvent } from "../../common/app-event-bus/emit-event.injectable";
+import type { Stat } from "../../common/fs/stat/stat.injectable";
+import type { IComputedValue } from "mobx";
 
 export class ShellOpenError extends Error {
   constructor(message: string, options?: ErrorOptions) {
@@ -104,6 +104,26 @@ export enum WebSocketCloseEvent {
   TlsHandshake = 1015,
 }
 
+export interface ShellSessionDependencies {
+  readonly isWindows: boolean;
+  readonly isMac: boolean;
+  readonly logger: Logger;
+  readonly userShellSetting: IComputedValue<string>;
+  readonly appName: string;
+  readonly buildVersion: InitializableState<string>;
+  computeShellEnvironment: ComputeShellEnvironment;
+  spawnPty: SpawnPty;
+  emitAppEvent: EmitAppEvent;
+  stat: Stat;
+}
+
+export interface ShellSessionArgs {
+  kubectl: Kubectl;
+  websocket: WebSocket;
+  cluster: Cluster;
+  tabId: string;
+}
+
 export abstract class ShellSession {
   abstract readonly ShellType: string;
 
@@ -130,29 +150,35 @@ export abstract class ShellSession {
   protected readonly kubectlBinDirP: Promise<string>;
   protected readonly kubeconfigPathP: Promise<string>;
   protected readonly terminalId: string;
+  protected readonly kubectl: Kubectl;
+  protected readonly websocket: WebSocket;
+  protected readonly cluster: Cluster;
 
   protected abstract get cwd(): string | undefined;
 
-  protected ensureShellProcess(shell: string, args: string[], env: Record<string, string | undefined>, cwd: string): { shellProcess: pty.IPty; resume: boolean } {
+  protected ensureShellProcess(shell: string, args: string[], env: Partial<Record<string, string>>, cwd: string): { shellProcess: pty.IPty; resume: boolean } {
     const resume = ShellSession.processes.has(this.terminalId);
     const shellProcess = getOrInsertWith(ShellSession.processes, this.terminalId, () => (
-      pty.spawn(shell, args, {
+      this.dependencies.spawnPty(shell, args, {
         rows: 30,
         cols: 80,
         cwd,
-        env: env as Record<string, string>,
+        env,
         name: "xterm-256color",
         // TODO: Something else is broken here so we need to force the use of winPty on windows
         useConpty: false,
       })
     ));
 
-    logger.info(`[SHELL-SESSION]: PTY for ${this.terminalId} is ${resume ? "resumed" : "started"} with PID=${shellProcess.pid}`);
+    this.dependencies.logger.info(`[SHELL-SESSION]: PTY for ${this.terminalId} is ${resume ? "resumed" : "started"} with PID=${shellProcess.pid}`);
 
     return { shellProcess, resume };
   }
 
-  constructor(protected readonly kubectl: Kubectl, protected readonly websocket: WebSocket, protected readonly cluster: Cluster, terminalId: string) {
+  constructor(protected readonly dependencies: ShellSessionDependencies, { kubectl, websocket, cluster, tabId: terminalId }: ShellSessionArgs) {
+    this.kubectl = kubectl;
+    this.websocket = websocket;
+    this.cluster = cluster;
     this.kubeconfigPathP = this.cluster.getProxyKubeconfigPath();
     this.kubectlBinDirP = this.kubectl.binDir();
     this.terminalId = `${cluster.id}:${terminalId}`;
@@ -165,7 +191,7 @@ export abstract class ShellSession {
   protected async getCwd(env: Record<string, string | undefined>): Promise<string> {
     const cwdOptions = [this.cwd];
 
-    if (isWindows) {
+    if (this.dependencies.isWindows) {
       cwdOptions.push(
         env.USERPROFILE,
         os.homedir(),
@@ -177,7 +203,7 @@ export abstract class ShellSession {
         os.homedir(),
       );
 
-      if (isMac) {
+      if (this.dependencies.isMac) {
         cwdOptions.push("/Users");
       } else {
         cwdOptions.push("/home");
@@ -190,7 +216,7 @@ export abstract class ShellSession {
       }
 
       try {
-        const stats = await stat(potentialCwd);
+        const stats = await this.dependencies.stat(potentialCwd);
 
         if (stats.isDirectory()) {
           return potentialCwd;
@@ -214,7 +240,7 @@ export abstract class ShellSession {
     this.running = true;
     shellProcess.onData(data => this.send({ type: TerminalChannels.STDOUT, data }));
     shellProcess.onExit(({ exitCode }) => {
-      logger.info(`[SHELL-SESSION]: shell has exited for ${this.terminalId} closed with exitcode=${exitCode}`);
+      this.dependencies.logger.info(`[SHELL-SESSION]: shell has exited for ${this.terminalId} closed with exitcode=${exitCode}`);
 
       // This might already be false because of the kill() within the websocket.on("close") handler
       if (this.running) {
@@ -232,11 +258,11 @@ export abstract class ShellSession {
     this.websocket
       .on("message", (rawData: unknown): void => {
         if (!this.running) {
-          return void logger.debug(`[SHELL-SESSION]: received message from ${this.terminalId}, but shellProcess isn't running`);
+          return void this.dependencies.logger.debug(`[SHELL-SESSION]: received message from ${this.terminalId}, but shellProcess isn't running`);
         }
 
         if (!(rawData instanceof Buffer)) {
-          return void logger.error(`[SHELL-SESSION]: Received message non-buffer message.`, { rawData });
+          return void this.dependencies.logger.error(`[SHELL-SESSION]: Received message non-buffer message.`, { rawData });
         }
 
         const data = rawData.toString();
@@ -252,18 +278,18 @@ export abstract class ShellSession {
               shellProcess.resize(message.data.width, message.data.height);
               break;
             case TerminalChannels.PING:
-              logger.silly(`[SHELL-SESSION]: ${this.terminalId} ping!`);
+              this.dependencies.logger.silly(`[SHELL-SESSION]: ${this.terminalId} ping!`);
               break;
             default:
-              logger.warn(`[SHELL-SESSION]: unknown or unhandleable message type for ${this.terminalId}`, message);
+              this.dependencies.logger.warn(`[SHELL-SESSION]: unknown or unhandleable message type for ${this.terminalId}`, message);
               break;
           }
         } catch (error) {
-          logger.error(`[SHELL-SESSION]: failed to handle message for ${this.terminalId}`, error);
+          this.dependencies.logger.error(`[SHELL-SESSION]: failed to handle message for ${this.terminalId}`, error);
         }
       })
       .once("close", code => {
-        logger.info(`[SHELL-SESSION]: websocket for ${this.terminalId} closed with code=${WebSocketCloseEvent[code]}(${code})`, { cluster: this.cluster.getMeta() });
+        this.dependencies.logger.info(`[SHELL-SESSION]: websocket for ${this.terminalId} closed with code=${WebSocketCloseEvent[code]}(${code})`, { cluster: this.cluster.getMeta() });
 
         const stopShellSession = this.running
           && (
@@ -278,16 +304,16 @@ export abstract class ShellSession {
           this.running = false;
 
           try {
-            logger.info(`[SHELL-SESSION]: Killing shell process (pid=${shellProcess.pid}) for ${this.terminalId}`);
+            this.dependencies.logger.info(`[SHELL-SESSION]: Killing shell process (pid=${shellProcess.pid}) for ${this.terminalId}`);
             shellProcess.kill();
             ShellSession.processes.delete(this.terminalId);
           } catch (error) {
-            logger.warn(`[SHELL-SESSION]: failed to kill shell process (pid=${shellProcess.pid}) for ${this.terminalId}`, error);
+            this.dependencies.logger.warn(`[SHELL-SESSION]: failed to kill shell process (pid=${shellProcess.pid}) for ${this.terminalId}`, error);
           }
         }
       });
 
-    appEventBus.emit({ name: this.ShellType, action: "open" });
+    this.dependencies.emitAppEvent({ name: this.ShellType, action: "open" });
   }
 
   protected getPathEntries(): string[] {
@@ -313,19 +339,27 @@ export abstract class ShellSession {
   }
 
   protected async getShellEnv() {
-    const env = clearKubeconfigEnvVars(JSON.parse(JSON.stringify(await shellEnv())));
-    const pathStr = [await this.kubectlBinDirP, ...this.getPathEntries(), process.env.PATH].join(path.delimiter);
-    const shell = UserStore.getInstance().resolvedShell;
+    const shell = this.dependencies.userShellSetting.get();
+    const result = await this.dependencies.computeShellEnvironment(shell);
+    const rawEnv = (() => {
+      if (result.callWasSuccessful) {
+        return result.response ?? process.env;
+      }
+
+      return process.env;
+    })();
+
+    const env = clearKubeconfigEnvVars(JSON.parse(JSON.stringify(rawEnv)));
+    const pathStr = [await this.kubectlBinDirP, ...this.getPathEntries(), env.PATH].join(path.delimiter);
 
     delete env.DEBUG; // don't pass DEBUG into shells
 
-    if (isWindows) {
-      env.SystemRoot = process.env.SystemRoot;
+    if (this.dependencies.isWindows) {
       env.PTYSHELL = shell || "powershell.exe";
       env.PATH = pathStr;
       env.LENS_SESSION = "true";
       env.WSLENV = [
-        process.env.WSLENV,
+        env.WSLENV,
         "KUBECONFIG/up:LENS_SESSION/u",
       ]
         .filter(Boolean)
@@ -345,8 +379,8 @@ export abstract class ShellSession {
 
     env.PTYPID = process.pid.toString();
     env.KUBECONFIG = await this.kubeconfigPathP;
-    env.TERM_PROGRAM = app.getName();
-    env.TERM_PROGRAM_VERSION = app.getVersion();
+    env.TERM_PROGRAM = this.dependencies.appName;
+    env.TERM_PROGRAM_VERSION = this.dependencies.buildVersion.get();
 
     if (this.cluster.preferences.httpsProxy) {
       env.HTTPS_PROXY = this.cluster.preferences.httpsProxy;
diff --git a/src/main/shell-session/spawn-pty.global-override-for-injectable.ts b/src/main/shell-session/spawn-pty.global-override-for-injectable.ts
new file mode 100644
index 0000000000..239f7c5e47
--- /dev/null
+++ b/src/main/shell-session/spawn-pty.global-override-for-injectable.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getGlobalOverride } from "../../common/test-utils/get-global-override";
+import spawnPtyInjectable from "./spawn-pty.injectable";
+
+export default getGlobalOverride(spawnPtyInjectable, () => () => {
+  throw new Error("Tried to spawn a PTY without an override");
+});
diff --git a/src/main/shell-session/spawn-pty.injectable.ts b/src/main/shell-session/spawn-pty.injectable.ts
new file mode 100644
index 0000000000..0639c7307b
--- /dev/null
+++ b/src/main/shell-session/spawn-pty.injectable.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { IPty, IPtyForkOptions, IWindowsPtyForkOptions } from "node-pty";
+import { spawn } from "node-pty";
+
+export type WindowsSpawnPtyOptions = Omit<IWindowsPtyForkOptions, "env"> & { env?: Partial<Record<string, string>> };
+export type UnixSpawnPtyOptions = Omit<IPtyForkOptions, "env"> & { env?: Partial<Record<string, string>> };
+export type SpawnPtyOptions = UnixSpawnPtyOptions | WindowsSpawnPtyOptions;
+
+export type SpawnPty = (file: string, args: string[], options: SpawnPtyOptions) => IPty;
+
+const spawnPtyInjectable = getInjectable({
+  id: "spawn-pty",
+  instantiate: () => spawn as SpawnPty,
+  causesSideEffects: true,
+});
+
+export default spawnPtyInjectable;
diff --git a/src/main/shell-sync.ts b/src/main/shell-sync.ts
deleted file mode 100644
index d2c58d0abe..0000000000
--- a/src/main/shell-sync.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { shellEnv } from "./utils/shell-env";
-import os from "os";
-import { app } from "electron";
-import logger from "./logger";
-import { isSnap } from "../common/vars";
-import { unionPATHs } from "../common/utils/union-env-path";
-
-/**
- * shellSync loads what would have been the environment if this application was
- * run from the command line, into the process.env object. This is especially
- * useful on macos where this always needs to be done.
- */
-export async function shellSync() {
-  const env = await shellEnv(os.userInfo().shell);
-
-  if (!env.LANG) {
-    // the LANG env var expects an underscore instead of electron's dash
-    env.LANG = `${app.getLocale().replace("-", "_")}.UTF-8`;
-  } else if (!env.LANG.endsWith(".UTF-8")) {
-    env.LANG += ".UTF-8";
-  }
-
-  if (!isSnap) {
-    // Prefer the synced PATH over the initial one
-    process.env.PATH = unionPATHs(env.PATH ?? "",  process.env.PATH ?? "");
-  }
-
-  // The spread operator allows joining of objects. The precedence is last to first.
-  process.env = {
-    ...env,
-    ...process.env,
-  };
-
-  logger.debug(`[SHELL-SYNC]: Synced shell env, and updating`, env, process.env);
-}
diff --git a/src/main/start-main-application/lens-window/application-window/create-application-window.injectable.ts b/src/main/start-main-application/lens-window/application-window/create-application-window.injectable.ts
index 1652b67f9b..703542faaa 100644
--- a/src/main/start-main-application/lens-window/application-window/create-application-window.injectable.ts
+++ b/src/main/start-main-application/lens-window/application-window/create-application-window.injectable.ts
@@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable";
 import createLensWindowInjectable from "./create-lens-window.injectable";
 import lensProxyPortInjectable from "../../../lens-proxy/lens-proxy-port.injectable";
 import isMacInjectable from "../../../../common/vars/is-mac.injectable";
-import appNameInjectable from "../../../app-paths/app-name/app-name.injectable";
-import appEventBusInjectable from "../../../../common/app-event-bus/app-event-bus.injectable";
 import waitUntilBundledExtensionsAreLoadedInjectable from "./wait-until-bundled-extensions-are-loaded.injectable";
 import { applicationWindowInjectionToken } from "./application-window-injection-token";
+import emitAppEventInjectable from "../../../../common/app-event-bus/emit-event.injectable";
 import { runInAction } from "mobx";
+import appNameInjectable from "../../../../common/vars/app-name.injectable";
 
 const createApplicationWindowInjectable = getInjectable({
   id: "create-application-window",
@@ -23,9 +23,9 @@ const createApplicationWindowInjectable = getInjectable({
         const createLensWindow = di.inject(createLensWindowInjectable);
         const isMac = di.inject(isMacInjectable);
         const applicationName = di.inject(appNameInjectable);
-        const appEventBus = di.inject(appEventBusInjectable);
         const waitUntilBundledExtensionsAreLoaded = di.inject(waitUntilBundledExtensionsAreLoadedInjectable);
         const lensProxyPort = di.inject(lensProxyPortInjectable);
+        const emitAppEvent = di.inject(emitAppEventInjectable);
 
         return createLensWindow({
           id,
@@ -40,13 +40,13 @@ const createApplicationWindowInjectable = getInjectable({
           titleBarStyle: isMac ? "hiddenInset" : "hidden",
           centered: false,
           onFocus: () => {
-            appEventBus.emit({ name: "app", action: "focus" });
+            emitAppEvent({ name: "app", action: "focus" });
           },
           onBlur: () => {
-            appEventBus.emit({ name: "app", action: "blur" });
+            emitAppEvent({ name: "app", action: "blur" });
           },
           onDomReady: () => {
-            appEventBus.emit({ name: "app", action: "dom-ready" });
+            emitAppEvent({ name: "app", action: "dom-ready" });
           },
 
           onClose: () => {
diff --git a/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts b/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts
index 252db16a1f..5e44c9d3ad 100644
--- a/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts
+++ b/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts
@@ -6,10 +6,15 @@ import { getInjectable } from "@ogre-tools/injectable";
 import loggerInjectable from "../../../../common/logger.injectable";
 import applicationWindowStateInjectable from "./application-window-state.injectable";
 import { BrowserWindow } from "electron";
-import sendToChannelInElectronBrowserWindowInjectable from "./send-to-channel-in-electron-browser-window.injectable";
 import type { ElectronWindow } from "./create-lens-window.injectable";
 import type { RequireExactlyOne } from "type-fest";
 import openLinkInBrowserInjectable from "../../../../common/utils/open-link-in-browser.injectable";
+import getAbsolutePathInjectable from "../../../../common/path/get-absolute-path.injectable";
+import lensResourcesDirInjectable from "../../../../common/vars/lens-resources-dir.injectable";
+import isLinuxInjectable from "../../../../common/vars/is-linux.injectable";
+import fsInjectable from "../../../../common/fs/fs.injectable";
+import applicationInformationInjectable from "../../../../common/vars/application-information.injectable";
+
 
 export type ElectronWindowTitleBarStyle = "hiddenInset" | "hidden" | "default" | "customButtonsOnHover";
 
@@ -45,8 +50,11 @@ const createElectronWindowInjectable = getInjectable({
 
   instantiate: (di): CreateElectronWindow => {
     const logger = di.inject(loggerInjectable);
-    const sendToChannelInLensWindow = di.inject(sendToChannelInElectronBrowserWindowInjectable);
     const openLinkInBrowser = di.inject(openLinkInBrowserInjectable);
+    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const lensResourcesDir = di.inject(lensResourcesDirInjectable);
+    const isLinux = di.inject(isLinuxInjectable);
+    const applicationInformation = di.inject(applicationInformationInjectable);
 
     return (configuration) => {
       const applicationWindowState = di.inject(
@@ -81,6 +89,23 @@ const createElectronWindowInjectable = getInjectable({
         },
       });
 
+      if (isLinux) {
+        const iconFileName = [
+          getAbsolutePath(lensResourcesDir, `../${applicationInformation.name}.png`),
+          `/usr/share/icons/hicolor/512x512/apps/${applicationInformation.name}.png`,
+        ].find(di.inject(fsInjectable).existsSync);
+
+        if (iconFileName != null) {
+          try {
+            browserWindow.setIcon(iconFileName);
+          } catch (err) {
+            logger.warn(`Error while setting window icon ${err}`);
+          }
+        } else {
+          logger.warn(`No suitable icon found for task bar.`);
+        }
+      }
+
       applicationWindowState.manage(browserWindow);
 
       browserWindow
@@ -140,7 +165,17 @@ const createElectronWindowInjectable = getInjectable({
 
         show: () => browserWindow.show(),
         close: () => browserWindow.close(),
-        send: (args) => sendToChannelInLensWindow(configuration.id, browserWindow, args),
+        send: ({ channel, data, frameInfo }) => {
+          if (frameInfo) {
+            browserWindow.webContents.sendToFrame(
+              [frameInfo.processId, frameInfo.frameId],
+              channel,
+              data,
+            );
+          } else {
+            browserWindow.webContents.send(channel, data);
+          }
+        },
 
         reload: () => {
           const wc = browserWindow.webContents;
diff --git a/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts b/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts
index 6dcf6b0174..b44e5774bd 100644
--- a/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts
+++ b/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts
@@ -20,7 +20,7 @@ export interface ElectronWindow {
 export interface SendToViewArgs {
   channel: string;
   frameInfo?: ClusterFrameInfo;
-  data?: unknown[];
+  data?: unknown;
 }
 
 export interface LensWindow {
diff --git a/src/main/start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable.ts b/src/main/start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable.ts
deleted file mode 100644
index 08de6fec46..0000000000
--- a/src/main/start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { BrowserWindow } from "electron";
-import type { SendToViewArgs } from "./create-lens-window.injectable";
-
-const sendToChannelInElectronBrowserWindowInjectable = getInjectable({
-  id: "send-to-channel-in-electron-browser-window",
-
-  instantiate:
-    () =>
-      (
-        windowId: string,
-        browserWindow: BrowserWindow,
-        { channel, frameInfo, data = [] }: SendToViewArgs,
-      ) => {
-        if (frameInfo) {
-          browserWindow.webContents.sendToFrame(
-            [frameInfo.processId, frameInfo.frameId],
-            channel,
-            ...data,
-          );
-        } else {
-          browserWindow.webContents.send(channel, ...data);
-        }
-      },
-
-  causesSideEffects: true,
-});
-
-export default sendToChannelInElectronBrowserWindowInjectable;
diff --git a/src/main/start-main-application/lens-window/current-cluster-frame/setup-listener-for-current-cluster-frame.injectable.ts b/src/main/start-main-application/lens-window/current-cluster-frame/setup-listener-for-current-cluster-frame.injectable.ts
index fa8b36c03a..24554c474f 100644
--- a/src/main/start-main-application/lens-window/current-cluster-frame/setup-listener-for-current-cluster-frame.injectable.ts
+++ b/src/main/start-main-application/lens-window/current-cluster-frame/setup-listener-for-current-cluster-frame.injectable.ts
@@ -14,6 +14,7 @@ const setupListenerForCurrentClusterFrameInjectable = getInjectable({
   id: "setup-listener-for-current-cluster-frame",
 
   instantiate: (di) => ({
+    id: "setup-listener-for-current-cluster-frame",
     run: () => {
       const currentClusterFrameState = di.inject(currentClusterFrameClusterIdStateInjectable);
 
diff --git a/src/main/start-main-application/lens-window/navigate.injectable.ts b/src/main/start-main-application/lens-window/navigate.injectable.ts
index 1916b8205f..8b204be9b3 100644
--- a/src/main/start-main-application/lens-window/navigate.injectable.ts
+++ b/src/main/start-main-application/lens-window/navigate.injectable.ts
@@ -37,7 +37,7 @@ const navigateInjectable = getInjectable({
       applicationWindow.send({
         channel,
         frameInfo,
-        data: [url],
+        data: url,
       });
     };
   },
diff --git a/src/main/start-main-application/lens-window/reload-current-application-window.injectable.ts b/src/main/start-main-application/lens-window/reload-current-application-window.injectable.ts
index daaf88a24c..9b0d04fe9f 100644
--- a/src/main/start-main-application/lens-window/reload-current-application-window.injectable.ts
+++ b/src/main/start-main-application/lens-window/reload-current-application-window.injectable.ts
@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { IpcRendererNavigationEvents } from "../../../renderer/navigation/events";
 import currentClusterFrameInjectable from "./current-cluster-frame/current-cluster-frame.injectable";
 import getCurrentApplicationWindowInjectable from "./application-window/get-current-application-window.injectable";
+import { reloadPageChannel } from "../../../features/navigation/reload-page/common/channel";
 
 const reloadCurrentApplicationWindowInjectable = getInjectable({
   id: "reload-current-application-window",
@@ -25,7 +25,7 @@ const reloadCurrentApplicationWindowInjectable = getInjectable({
 
       if (frameInfo) {
         lensWindow.send({
-          channel: IpcRendererNavigationEvents.RELOAD_PAGE,
+          channel: reloadPageChannel.id,
           frameInfo,
         });
       } else {
diff --git a/src/main/start-main-application/lens-window/splash-window/splash-window.injectable.ts b/src/main/start-main-application/lens-window/splash-window/splash-window.injectable.ts
index 72c65d6c8d..978309c4d0 100644
--- a/src/main/start-main-application/lens-window/splash-window/splash-window.injectable.ts
+++ b/src/main/start-main-application/lens-window/splash-window/splash-window.injectable.ts
@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import createLensWindowInjectable from "../application-window/create-lens-window.injectable";
 import staticFilesDirectoryInjectable from "../../../../common/vars/static-files-directory.injectable";
-import getAbsolutePathInjectable from "../../../../common/path/get-absolute-path.injectable";
+import joinPathsInjectable from "../../../../common/path/join-paths.injectable";
 
 const splashWindowInjectable = getInjectable({
   id: "splash-window",
@@ -13,8 +13,8 @@ const splashWindowInjectable = getInjectable({
   instantiate: (di) => {
     const createLensWindow = di.inject(createLensWindowInjectable);
     const staticFilesDirectory = di.inject(staticFilesDirectoryInjectable);
-    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
-    const splashWindowFile = getAbsolutePath(staticFilesDirectory, "splash.html");
+    const joinPaths = di.inject(joinPathsInjectable);
+    const splashWindowFile = joinPaths(staticFilesDirectory, "splash.html");
 
     return createLensWindow({
       id: "splash",
diff --git a/src/main/start-main-application/runnable-tokens/before-electron-is-ready-injection-token.ts b/src/main/start-main-application/runnable-tokens/before-electron-is-ready-injection-token.ts
index 08173ebef2..4bdef1ff90 100644
--- a/src/main/start-main-application/runnable-tokens/before-electron-is-ready-injection-token.ts
+++ b/src/main/start-main-application/runnable-tokens/before-electron-is-ready-injection-token.ts
@@ -5,7 +5,6 @@
 import { getInjectionToken } from "@ogre-tools/injectable";
 import type { RunnableSync } from "../../../common/runnable/run-many-sync-for";
 
-export const beforeElectronIsReadyInjectionToken =
-  getInjectionToken<RunnableSync>({
-    id: "before-electron-is-ready",
-  });
+export const beforeElectronIsReadyInjectionToken = getInjectionToken<RunnableSync>({
+  id: "before-electron-is-ready",
+});
diff --git a/src/main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token.ts b/src/main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token.ts
index bdb1d1e1be..d11ecf57d2 100644
--- a/src/main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token.ts
+++ b/src/main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token.ts
@@ -5,7 +5,6 @@
 import { getInjectionToken } from "@ogre-tools/injectable";
 import type { RunnableSync } from "../../../common/runnable/run-many-sync-for";
 
-export const beforeQuitOfBackEndInjectionToken =
-  getInjectionToken<RunnableSync>({
-    id: "before-quit-of-back-end",
-  });
+export const beforeQuitOfBackEndInjectionToken = getInjectionToken<RunnableSync>({
+  id: "before-quit-of-back-end",
+});
diff --git a/src/main/start-main-application/runnable-tokens/before-quit-of-front-end-injection-token.ts b/src/main/start-main-application/runnable-tokens/before-quit-of-front-end-injection-token.ts
index 2327688cb3..0a45a684cd 100644
--- a/src/main/start-main-application/runnable-tokens/before-quit-of-front-end-injection-token.ts
+++ b/src/main/start-main-application/runnable-tokens/before-quit-of-front-end-injection-token.ts
@@ -5,7 +5,6 @@
 import { getInjectionToken } from "@ogre-tools/injectable";
 import type { RunnableSync } from "../../../common/runnable/run-many-sync-for";
 
-export const beforeQuitOfFrontEndInjectionToken =
-  getInjectionToken<RunnableSync>({
-    id: "before-quit-of-front-end",
-  });
+export const beforeQuitOfFrontEndInjectionToken = getInjectionToken<RunnableSync>({
+  id: "before-quit-of-front-end",
+});
diff --git a/src/main/start-main-application/runnable-tokens/phases.ts b/src/main/start-main-application/runnable-tokens/phases.ts
new file mode 100644
index 0000000000..0b61ae88f2
--- /dev/null
+++ b/src/main/start-main-application/runnable-tokens/phases.ts
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectionToken } from "@ogre-tools/injectable";
+import type { Runnable } from "../../../common/runnable/run-many-for";
+import type { RunnableSync } from "../../../common/runnable/run-many-sync-for";
+
+/**
+ * These tokens are here so that the importing of their respective dependencies
+ * can be delayed until all of them are ready
+ */
+
+/**
+ * This runnable token should only have the app paths init so that it can be run by itself
+ */
+export const appPathsRunnablePhaseInjectionToken = getInjectionToken<RunnableSync>({
+  id: "app-paths-runnable-phase",
+});
+
+export const showLoadingRunnablePhaseInjectionToken = getInjectionToken<Runnable>({
+  id: "show-loading-runnable-phase",
+});
+
+export const showInitialWindowRunnablePhaseInjectionToken = getInjectionToken<Runnable>({
+  id: "show-initial-window-runnable-phase",
+});
diff --git a/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts b/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts
index 07066535a1..46afa5e692 100644
--- a/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts
+++ b/src/main/start-main-application/runnables/clean-up-shell-sessions.injectable.ts
@@ -10,9 +10,8 @@ const cleanUpShellSessionsInjectable = getInjectable({
   id: "clean-up-shell-sessions",
 
   instantiate: () => ({
-    run: () => {
-      ShellSession.cleanup();
-    },
+    id: "clean-up-shell-sessions",
+    run: () => void ShellSession.cleanup(),
   }),
 
   injectionToken: beforeQuitOfBackEndInjectionToken,
diff --git a/src/main/start-main-application/runnables/emit-close-to-event-bus.injectable.ts b/src/main/start-main-application/runnables/emit-close-to-event-bus.injectable.ts
index 316114f205..e1da8c1d67 100644
--- a/src/main/start-main-application/runnables/emit-close-to-event-bus.injectable.ts
+++ b/src/main/start-main-application/runnables/emit-close-to-event-bus.injectable.ts
@@ -3,18 +3,21 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import appEventBusInjectable from "../../../common/app-event-bus/app-event-bus.injectable";
+import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
 import { beforeQuitOfFrontEndInjectionToken } from "../runnable-tokens/before-quit-of-front-end-injection-token";
 
 const emitCloseToEventBusInjectable = getInjectable({
   id: "emit-close-to-event-bus",
 
   instantiate: (di) => {
-    const appEventBus = di.inject(appEventBusInjectable);
+    const emitAppEvent = di.inject(emitAppEventInjectable);
 
     return {
+      id: "emit-close-to-event-bus",
       run: () => {
-        appEventBus.emit({ name: "app", action: "close" });
+        emitAppEvent({ name: "app", action: "close" });
+
+        return undefined;
       },
     };
   },
diff --git a/src/main/start-main-application/runnables/emit-service-start-to-event-bus.injectable.ts b/src/main/start-main-application/runnables/emit-service-start-to-event-bus.injectable.ts
index 0d3e4cf043..9655748a72 100644
--- a/src/main/start-main-application/runnables/emit-service-start-to-event-bus.injectable.ts
+++ b/src/main/start-main-application/runnables/emit-service-start-to-event-bus.injectable.ts
@@ -3,18 +3,19 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import appEventBusInjectable from "../../../common/app-event-bus/app-event-bus.injectable";
+import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
 import { afterApplicationIsLoadedInjectionToken } from "../runnable-tokens/after-application-is-loaded-injection-token";
 
 const emitServiceStartToEventBusInjectable = getInjectable({
   id: "emit-service-start-to-event-bus",
 
   instantiate: (di) => {
-    const appEventBus = di.inject(appEventBusInjectable);
+    const emitAppEvent = di.inject(emitAppEventInjectable);
 
     return {
+      id: "emit-service-start-to-event-bus",
       run: () => {
-        appEventBus.emit({ name: "service", action: "start" });
+        emitAppEvent({ name: "service", action: "start" });
       },
     };
   },
diff --git a/src/main/start-main-application/runnables/flag-renderer/flag-renderer-as-loaded.injectable.ts b/src/main/start-main-application/runnables/flag-renderer/flag-renderer-as-loaded.injectable.ts
index 3c61b2a011..2bb05cfb52 100644
--- a/src/main/start-main-application/runnables/flag-renderer/flag-renderer-as-loaded.injectable.ts
+++ b/src/main/start-main-application/runnables/flag-renderer/flag-renderer-as-loaded.injectable.ts
@@ -14,6 +14,7 @@ const flagRendererAsLoadedInjectable = getInjectable({
     const lensProtocolRouterMain = di.inject(lensProtocolRouterMainInjectable);
 
     return {
+      id: "flag-renderer-as-loaded",
       run: () => {
         runInAction(() => {
           // Todo: remove this kludge which enables out-of-place temporal dependency.
diff --git a/src/main/start-main-application/runnables/flag-renderer/flag-renderer-as-not-loaded.injectable.ts b/src/main/start-main-application/runnables/flag-renderer/flag-renderer-as-not-loaded.injectable.ts
index d81f7287aa..d5f7444232 100644
--- a/src/main/start-main-application/runnables/flag-renderer/flag-renderer-as-not-loaded.injectable.ts
+++ b/src/main/start-main-application/runnables/flag-renderer/flag-renderer-as-not-loaded.injectable.ts
@@ -14,11 +14,14 @@ const flagRendererAsNotLoadedInjectable = getInjectable({
     const lensProtocolRouterMain = di.inject(lensProtocolRouterMainInjectable);
 
     return {
+      id: "stop-deep-linking",
       run: () => {
         runInAction(() => {
           // Todo: remove this kludge which enables out-of-place temporal dependency.
           lensProtocolRouterMain.rendererLoaded = false;
         });
+
+        return undefined;
       },
     };
   },
diff --git a/src/main/start-main-application/runnables/initialize-extensions.injectable.ts b/src/main/start-main-application/runnables/initialize-extensions.injectable.ts
index 899d684abf..8765721d90 100644
--- a/src/main/start-main-application/runnables/initialize-extensions.injectable.ts
+++ b/src/main/start-main-application/runnables/initialize-extensions.injectable.ts
@@ -21,6 +21,7 @@ const initializeExtensionsInjectable = getInjectable({
     const showErrorPopup = di.inject(showErrorPopupInjectable);
 
     return {
+      id: "initialize-extensions",
       run: async () => {
         logger.info("🧩 Initializing extensions");
 
diff --git a/src/main/start-main-application/runnables/kube-config-sync/add-source.injectable.ts b/src/main/start-main-application/runnables/kube-config-sync/add-source.injectable.ts
new file mode 100644
index 0000000000..f95a39f665
--- /dev/null
+++ b/src/main/start-main-application/runnables/kube-config-sync/add-source.injectable.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import kubeconfigSyncManagerInjectable from "../../../catalog-sources/kubeconfig-sync/manager.injectable";
+import catalogEntityRegistryInjectable from "../../../catalog/entity-registry.injectable";
+import { afterApplicationIsLoadedInjectionToken } from "../../runnable-tokens/after-application-is-loaded-injection-token";
+
+const addKubeconfigSyncAsEntitySourceInjectable = getInjectable({
+  id: "add-kubeconfig-sync-as-entity-source",
+  instantiate: (di) => {
+    const kubeConfigSyncManager = di.inject(kubeconfigSyncManagerInjectable);
+    const entityRegistry = di.inject(catalogEntityRegistryInjectable);
+
+    return {
+      id: "add-kubeconfig-sync-as-entity-source",
+      run: () => {
+        entityRegistry.addComputedSource("kubeconfig-sync", kubeConfigSyncManager.source);
+      },
+    };
+  },
+  injectionToken: afterApplicationIsLoadedInjectionToken,
+});
+
+export default addKubeconfigSyncAsEntitySourceInjectable;
diff --git a/src/main/start-main-application/runnables/kube-config-sync/start-kube-config-sync.injectable.ts b/src/main/start-main-application/runnables/kube-config-sync/start-kube-config-sync.injectable.ts
index 0b585f3d65..ad0e446565 100644
--- a/src/main/start-main-application/runnables/kube-config-sync/start-kube-config-sync.injectable.ts
+++ b/src/main/start-main-application/runnables/kube-config-sync/start-kube-config-sync.injectable.ts
@@ -7,6 +7,7 @@ import { afterApplicationIsLoadedInjectionToken } from "../../runnable-tokens/af
 import directoryForKubeConfigsInjectable from "../../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
 import ensureDirInjectable from "../../../../common/fs/ensure-dir.injectable";
 import kubeconfigSyncManagerInjectable from "../../../catalog-sources/kubeconfig-sync/manager.injectable";
+import addKubeconfigSyncAsEntitySourceInjectable from "./add-source.injectable";
 
 const startKubeConfigSyncInjectable = getInjectable({
   id: "start-kubeconfig-sync",
@@ -17,11 +18,13 @@ const startKubeConfigSyncInjectable = getInjectable({
     const ensureDir = di.inject(ensureDirInjectable);
 
     return {
+      id: "start-kubeconfig-sync",
       run: async () => {
         await ensureDir(directoryForKubeConfigs);
 
         kubeConfigSyncManager.startSync();
       },
+      runAfter: di.inject(addKubeconfigSyncAsEntitySourceInjectable),
     };
   },
 
diff --git a/src/main/start-main-application/runnables/kube-config-sync/stop-kube-config-sync.injectable.ts b/src/main/start-main-application/runnables/kube-config-sync/stop-kube-config-sync.injectable.ts
index 6bdf5a7476..4cb5a98a3f 100644
--- a/src/main/start-main-application/runnables/kube-config-sync/stop-kube-config-sync.injectable.ts
+++ b/src/main/start-main-application/runnables/kube-config-sync/stop-kube-config-sync.injectable.ts
@@ -13,9 +13,8 @@ const stopKubeConfigSyncInjectable = getInjectable({
     const kubeConfigSyncManager = di.inject(kubeconfigSyncManagerInjectable);
 
     return {
-      run: () => {
-        kubeConfigSyncManager.stopSync();
-      },
+      id: "stop-kube-config-sync",
+      run: () => void kubeConfigSyncManager.stopSync(),
     };
   },
 
diff --git a/src/main/start-main-application/runnables/root-frame-has-rendered/channel-listener.injectable.ts b/src/main/start-main-application/runnables/root-frame-has-rendered/channel-listener.injectable.ts
new file mode 100644
index 0000000000..40f5ceb788
--- /dev/null
+++ b/src/main/start-main-application/runnables/root-frame-has-rendered/channel-listener.injectable.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getMessageChannelListenerInjectable } from "../../../../common/utils/channel/message-channel-listener-injection-token";
+import { rootFrameHasRenderedChannel } from "../../../../common/root-frame/root-frame-rendered-channel";
+import { runManyFor } from "../../../../common/runnable/run-many-for";
+import { afterRootFrameIsReadyInjectionToken } from "../../runnable-tokens/after-root-frame-is-ready-injection-token";
+
+const rootFrameRenderedChannelListenerInjectable = getMessageChannelListenerInjectable({
+  id: "action",
+  channel: rootFrameHasRenderedChannel,
+  handler: (di) => {
+    const runMany = runManyFor(di);
+
+    return runMany(afterRootFrameIsReadyInjectionToken);
+  },
+});
+
+export default rootFrameRenderedChannelListenerInjectable;
diff --git a/src/main/start-main-application/runnables/root-frame-rendered-channel-listener/root-frame-rendered-channel-listener.injectable.ts b/src/main/start-main-application/runnables/root-frame-rendered-channel-listener/root-frame-rendered-channel-listener.injectable.ts
deleted file mode 100644
index 83ebf7bf91..0000000000
--- a/src/main/start-main-application/runnables/root-frame-rendered-channel-listener/root-frame-rendered-channel-listener.injectable.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import rootFrameRenderedChannelInjectable from "../../../../common/root-frame-rendered-channel/root-frame-rendered-channel.injectable";
-import { runManyFor } from "../../../../common/runnable/run-many-for";
-import { afterRootFrameIsReadyInjectionToken } from "../../runnable-tokens/after-root-frame-is-ready-injection-token";
-import { messageChannelListenerInjectionToken } from "../../../../common/utils/channel/message-channel-listener-injection-token";
-
-const rootFrameRenderedChannelListenerInjectable = getInjectable({
-  id: "root-frame-rendered-channel-listener",
-
-  instantiate: (di) => {
-    const channel = di.inject(rootFrameRenderedChannelInjectable);
-
-    const runMany = runManyFor(di);
-
-    const runRunnablesAfterRootFrameIsReady = runMany(
-      afterRootFrameIsReadyInjectionToken,
-    );
-
-    return {
-      channel,
-
-      handler: async () => {
-        await runRunnablesAfterRootFrameIsReady();
-      },
-    };
-  },
-
-  injectionToken: messageChannelListenerInjectionToken,
-});
-
-export default rootFrameRenderedChannelListenerInjectable;
diff --git a/src/main/start-main-application/runnables/sentry/initialize-on-main.global-override-for-injectable.ts b/src/main/start-main-application/runnables/sentry/initialize-on-main.global-override-for-injectable.ts
new file mode 100644
index 0000000000..3850c736a0
--- /dev/null
+++ b/src/main/start-main-application/runnables/sentry/initialize-on-main.global-override-for-injectable.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../../../../common/test-utils/get-global-override";
+import initializeSentryOnMainInjectable from "./initialize-on-main.injectable";
+
+export default getGlobalOverride(initializeSentryOnMainInjectable, () => () => {});
diff --git a/src/main/start-main-application/runnables/sentry/initialize-on-main.injectable.ts b/src/main/start-main-application/runnables/sentry/initialize-on-main.injectable.ts
new file mode 100644
index 0000000000..e60f16ff46
--- /dev/null
+++ b/src/main/start-main-application/runnables/sentry/initialize-on-main.injectable.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { init } from "@sentry/electron/main";
+
+const initializeSentryOnMainInjectable = getInjectable({
+  id: "initialize-sentry-on-main",
+  instantiate: () => init,
+  causesSideEffects: true,
+});
+
+export default initializeSentryOnMainInjectable;
diff --git a/src/main/start-main-application/runnables/sentry/setup.injectable.ts b/src/main/start-main-application/runnables/sentry/setup.injectable.ts
new file mode 100644
index 0000000000..6d4111ae78
--- /dev/null
+++ b/src/main/start-main-application/runnables/sentry/setup.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { beforeElectronIsReadyInjectionToken } from "../../runnable-tokens/before-electron-is-ready-injection-token";
+import initializeSentryReportingWithInjectable from "../../../../common/error-reporting/initialize-sentry-reporting.injectable";
+import initializeSentryOnMainInjectable from "./initialize-on-main.injectable";
+
+const setupSentryInjectable = getInjectable({
+  id: "setup-sentry",
+  instantiate: (di) => {
+    const initializeSentryReportingWith = di.inject(initializeSentryReportingWithInjectable);
+    const initializeSentryOnMain = di.inject(initializeSentryOnMainInjectable);
+
+    return {
+      id: "setup-sentry",
+      run: () => void initializeSentryReportingWith(initializeSentryOnMain),
+    };
+  },
+  injectionToken: beforeElectronIsReadyInjectionToken,
+});
+
+export default setupSentryInjectable;
diff --git a/src/main/start-main-application/runnables/setup-detector-registry.injectable.ts b/src/main/start-main-application/runnables/setup-detector-registry.injectable.ts
index 1c91e797f3..0e8b7ffba2 100644
--- a/src/main/start-main-application/runnables/setup-detector-registry.injectable.ts
+++ b/src/main/start-main-application/runnables/setup-detector-registry.injectable.ts
@@ -18,6 +18,7 @@ const setupDetectorRegistryInjectable = getInjectable({
     const detectorRegistry = di.inject(detectorRegistryInjectable);
 
     return {
+      id: "setup-detector-registry",
       run: () => {
         detectorRegistry
           .add(ClusterIdDetector)
diff --git a/src/main/start-main-application/runnables/setup-hardware-acceleration.injectable.ts b/src/main/start-main-application/runnables/setup-hardware-acceleration.injectable.ts
index ba1b5f2bb8..905cb9e130 100644
--- a/src/main/start-main-application/runnables/setup-hardware-acceleration.injectable.ts
+++ b/src/main/start-main-application/runnables/setup-hardware-acceleration.injectable.ts
@@ -15,10 +15,13 @@ const setupHardwareAccelerationInjectable = getInjectable({
     const disableHardwareAcceleration = di.inject(disableHardwareAccelerationInjectable);
 
     return {
+      id: "setup-hardware-acceleration",
       run: () => {
         if (hardwareAccelerationShouldBeDisabled) {
           disableHardwareAcceleration();
         }
+
+        return undefined;
       },
     };
   },
diff --git a/src/main/start-main-application/runnables/setup-hotbar-store.injectable.ts b/src/main/start-main-application/runnables/setup-hotbar-store.injectable.ts
index 372c339e5e..4f46e46073 100644
--- a/src/main/start-main-application/runnables/setup-hotbar-store.injectable.ts
+++ b/src/main/start-main-application/runnables/setup-hotbar-store.injectable.ts
@@ -11,6 +11,7 @@ const setupHotbarStoreInjectable = getInjectable({
   id: "setup-hotbar-store",
 
   instantiate: (di) => ({
+    id: "setup-hotbar-store",
     run: () => {
       const hotbarStore = di.inject(hotbarStoreInjectable);
 
diff --git a/src/main/start-main-application/runnables/setup-immer.injectable.ts b/src/main/start-main-application/runnables/setup-immer.injectable.ts
index 63cd6e3f2f..61420cf35b 100644
--- a/src/main/start-main-application/runnables/setup-immer.injectable.ts
+++ b/src/main/start-main-application/runnables/setup-immer.injectable.ts
@@ -10,11 +10,14 @@ const setupImmerInjectable = getInjectable({
   id: "setup-immer",
 
   instantiate: () => ({
+    id: "setup-immer",
     run: () => {
       // Docs: https://immerjs.github.io/immer/
       // Required in `utils/storage-helper.ts`
       Immer.setAutoFreeze(false); // allow to merge mobx observables
       Immer.enableMapSet(); // allow to merge maps and sets
+
+      return undefined;
     },
   }),
 
diff --git a/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts b/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts
index 8b90bcf5e3..281c1ff844 100644
--- a/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts
+++ b/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { getAppVersion, getAppVersionFromProxyServer } from "../../../common/utils";
+import { getAppVersionFromProxyServer } from "../../../common/utils";
 import exitAppInjectable from "../../electron-app/features/exit-app.injectable";
 import lensProxyInjectable from "../../lens-proxy/lens-proxy.injectable";
 import loggerInjectable from "../../../common/logger.injectable";
@@ -11,6 +11,8 @@ import lensProxyPortInjectable from "../../lens-proxy/lens-proxy-port.injectable
 import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
 import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable";
 import { beforeApplicationIsLoadingInjectionToken } from "../runnable-tokens/before-application-is-loading-injection-token";
+import buildVersionInjectable from "../../vars/build-version/build-version.injectable";
+import initializeBuildVersionInjectable from "../../vars/build-version/init.injectable";
 
 const setupLensProxyInjectable = getInjectable({
   id: "setup-lens-proxy",
@@ -22,8 +24,10 @@ const setupLensProxyInjectable = getInjectable({
     const lensProxyPort = di.inject(lensProxyPortInjectable);
     const isWindows = di.inject(isWindowsInjectable);
     const showErrorPopup = di.inject(showErrorPopupInjectable);
+    const buildVersion = di.inject(buildVersionInjectable);
 
     return {
+      id: "setup-lens-proxy",
       run: async () => {
         try {
           logger.info("🔌 Starting LensProxy");
@@ -41,7 +45,7 @@ const setupLensProxyInjectable = getInjectable({
             lensProxyPort.get(),
           );
 
-          if (getAppVersion() !== versionFromProxy) {
+          if (buildVersion.get() !== versionFromProxy) {
             logger.error("Proxy server responded with invalid response");
 
             return exitApp();
@@ -66,6 +70,7 @@ const setupLensProxyInjectable = getInjectable({
           return exitApp();
         }
       },
+      runAfter: di.inject(initializeBuildVersionInjectable),
     };
   },
 
diff --git a/src/main/start-main-application/runnables/setup-mobx.injectable.ts b/src/main/start-main-application/runnables/setup-mobx.injectable.ts
index ca5a124b77..d13021cdc6 100644
--- a/src/main/start-main-application/runnables/setup-mobx.injectable.ts
+++ b/src/main/start-main-application/runnables/setup-mobx.injectable.ts
@@ -10,6 +10,7 @@ const setupMobxInjectable = getInjectable({
   id: "setup-mobx",
 
   instantiate: () => ({
+    id: "setup-mobx",
     run: () => {
       // Docs: https://mobx.js.org/configuration.html
       Mobx.configure({
@@ -20,6 +21,8 @@ const setupMobxInjectable = getInjectable({
         // reactionRequiresObservable: true,
         // observableRequiresReaction: true,
       });
+
+      return undefined;
     },
   }),
 
diff --git a/src/main/start-main-application/runnables/setup-prometheus-registry.injectable.ts b/src/main/start-main-application/runnables/setup-prometheus-registry.injectable.ts
deleted file mode 100644
index 28b410889d..0000000000
--- a/src/main/start-main-application/runnables/setup-prometheus-registry.injectable.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { PrometheusLens } from "../../prometheus/lens";
-import { PrometheusHelm } from "../../prometheus/helm";
-import { PrometheusHelm14 } from "../../prometheus/helm-14";
-import { PrometheusOperator } from "../../prometheus/operator";
-import { PrometheusStacklight } from "../../prometheus/stacklight";
-import prometheusProviderRegistryInjectable from "../../prometheus/prometheus-provider-registry.injectable";
-import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token";
-
-const setupPrometheusRegistryInjectable = getInjectable({
-  id: "setup-prometheus-registry",
-
-  instantiate: (di) => {
-    const prometheusProviderRegistry = di.inject(prometheusProviderRegistryInjectable);
-
-    return {
-      run: () => {
-        prometheusProviderRegistry
-          .registerProvider(new PrometheusLens())
-          .registerProvider(new PrometheusHelm14())
-          .registerProvider(new PrometheusHelm())
-          .registerProvider(new PrometheusOperator())
-          .registerProvider(new PrometheusStacklight());
-      },
-    };
-  },
-
-  injectionToken: onLoadOfApplicationInjectionToken,
-});
-
-export default setupPrometheusRegistryInjectable;
diff --git a/src/main/start-main-application/runnables/setup-proxy-env.injectable.ts b/src/main/start-main-application/runnables/setup-proxy-env.injectable.ts
index 7c05ad8b49..0541c2cfda 100644
--- a/src/main/start-main-application/runnables/setup-proxy-env.injectable.ts
+++ b/src/main/start-main-application/runnables/setup-proxy-env.injectable.ts
@@ -13,6 +13,7 @@ const setupProxyEnvInjectable = getInjectable({
     const getCommandLineSwitch = di.inject(getCommandLineSwitchInjectable);
 
     return {
+      id: "setup-proxy-env",
       run: () => {
         const switchValue = getCommandLineSwitch("proxy-server");
 
@@ -33,6 +34,8 @@ const setupProxyEnvInjectable = getInjectable({
         if (getCommandLineSwitch("proxy-server") !== "") {
           process.env.HTTPS_PROXY = getCommandLineSwitch("proxy-server");
         }
+
+        return undefined;
       },
     };
   },
diff --git a/src/main/start-main-application/runnables/setup-reactions-in-user-store.injectable.ts b/src/main/start-main-application/runnables/setup-reactions-in-user-store.injectable.ts
index 7ab26a1506..f40c3c8796 100644
--- a/src/main/start-main-application/runnables/setup-reactions-in-user-store.injectable.ts
+++ b/src/main/start-main-application/runnables/setup-reactions-in-user-store.injectable.ts
@@ -13,6 +13,7 @@ const setupReactionsInUserStoreInjectable = getInjectable({
     const userStore = di.inject(userStoreInjectable);
 
     return {
+      id: "setup-reactions-in-user-store",
       run: () => {
         userStore.startMainReactions();
       },
diff --git a/src/main/start-main-application/runnables/setup-sentry.injectable.ts b/src/main/start-main-application/runnables/setup-sentry.injectable.ts
deleted file mode 100644
index 4ba3763a16..0000000000
--- a/src/main/start-main-application/runnables/setup-sentry.injectable.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { initializeSentryReporting } from "../../../common/sentry";
-import { init } from "@sentry/electron/main";
-import { beforeElectronIsReadyInjectionToken } from "../runnable-tokens/before-electron-is-ready-injection-token";
-
-const setupSentryInjectable = getInjectable({
-  id: "setup-sentry",
-
-  instantiate: () => ({
-    run: () => {
-      initializeSentryReporting(init);
-    },
-  }),
-
-  causesSideEffects: true,
-
-  injectionToken: beforeElectronIsReadyInjectionToken,
-});
-
-export default setupSentryInjectable;
diff --git a/src/main/start-main-application/runnables/setup-shell.injectable.ts b/src/main/start-main-application/runnables/setup-shell.injectable.ts
deleted file mode 100644
index 0f23e0f2e8..0000000000
--- a/src/main/start-main-application/runnables/setup-shell.injectable.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { shellSync } from "../../shell-sync";
-import loggerInjectable from "../../../common/logger.injectable";
-import { onLoadOfApplicationInjectionToken } from "../runnable-tokens/on-load-of-application-injection-token";
-
-const setupShellInjectable = getInjectable({
-  id: "setup-shell",
-
-  instantiate: (di) => {
-    const logger = di.inject(loggerInjectable);
-
-    return {
-      run: async () => {
-        logger.info("🐚 Syncing shell environment");
-
-        await shellSync();
-      },
-    };
-  },
-
-  injectionToken: onLoadOfApplicationInjectionToken,
-  causesSideEffects: true,
-});
-
-export default setupShellInjectable;
diff --git a/src/main/start-main-application/runnables/setup-syncing-of-general-catalog-entities.injectable.ts b/src/main/start-main-application/runnables/setup-syncing-of-general-catalog-entities.injectable.ts
index e44752b324..6dc0b27512 100644
--- a/src/main/start-main-application/runnables/setup-syncing-of-general-catalog-entities.injectable.ts
+++ b/src/main/start-main-application/runnables/setup-syncing-of-general-catalog-entities.injectable.ts
@@ -15,6 +15,7 @@ const setupSyncingOfGeneralCatalogEntitiesInjectable = getInjectable({
     );
 
     return {
+      id: "setup-syncing-of-general-catalog-entities",
       run: () => {
         syncGeneralCatalogEntities();
       },
diff --git a/src/main/start-main-application/runnables/setup-syncing-of-weblinks.injectable.ts b/src/main/start-main-application/runnables/setup-syncing-of-weblinks.injectable.ts
index 0e5ada1b78..fa4e6b436c 100644
--- a/src/main/start-main-application/runnables/setup-syncing-of-weblinks.injectable.ts
+++ b/src/main/start-main-application/runnables/setup-syncing-of-weblinks.injectable.ts
@@ -13,6 +13,7 @@ const setupSyncingOfWeblinksInjectable = getInjectable({
     const syncWeblinks = di.inject(syncWeblinksInjectable);
 
     return {
+      id: "setup-syncing-of-weblinks",
       run: () => {
         syncWeblinks();
       },
diff --git a/src/main/start-main-application/runnables/setup-system-ca.injectable.ts b/src/main/start-main-application/runnables/setup-system-ca.injectable.ts
index 0a09ebebd4..b5219dbf4f 100644
--- a/src/main/start-main-application/runnables/setup-system-ca.injectable.ts
+++ b/src/main/start-main-application/runnables/setup-system-ca.injectable.ts
@@ -2,21 +2,16 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { injectSystemCAs } from "../../../common/system-ca";
 import { getInjectable } from "@ogre-tools/injectable";
 import { beforeApplicationIsLoadingInjectionToken } from "../runnable-tokens/before-application-is-loading-injection-token";
+import injectSystemCAsInjectable from "../../../common/certificate-authorities/inject-system-cas.injectable";
 
 const setupSystemCaInjectable = getInjectable({
   id: "setup-system-ca",
-
-  instantiate: () => ({
-    run: async () => {
-      await injectSystemCAs();
-    },
+  instantiate: (di) => ({
+    id: "setup-system-ca",
+    run: di.inject(injectSystemCAsInjectable),
   }),
-
-  causesSideEffects: true,
-
   injectionToken: beforeApplicationIsLoadingInjectionToken,
 });
 
diff --git a/src/main/start-main-application/runnables/show-initial-window.injectable.ts b/src/main/start-main-application/runnables/show-initial-window.injectable.ts
new file mode 100644
index 0000000000..0ce02bfa85
--- /dev/null
+++ b/src/main/start-main-application/runnables/show-initial-window.injectable.ts
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import shouldStartHiddenInjectable from "../../electron-app/features/should-start-hidden.injectable";
+import openDeepLinkInjectable from "../../protocol-handler/lens-protocol-router-main/open-deep-link-for-url/open-deep-link.injectable";
+import commandLineArgumentsInjectable from "../../utils/command-line-arguments.injectable";
+import createFirstApplicationWindowInjectable from "../lens-window/application-window/create-first-application-window.injectable";
+import splashWindowInjectable from "../lens-window/splash-window/splash-window.injectable";
+import { showInitialWindowRunnablePhaseInjectionToken } from "../runnable-tokens/phases";
+
+const getDeepLinkUrl = (commandLineArguments: string[]) => (
+  commandLineArguments
+    .map(arg => arg.toLowerCase())
+    .find(arg => arg.startsWith("lens://"))
+);
+
+const showInitialWindowInjectable = getInjectable({
+  id: "show-initial-window",
+  instantiate: (di) => {
+    const shouldStartHidden = di.inject(shouldStartHiddenInjectable);
+    const shouldStartWindow = !shouldStartHidden;
+    const createFirstApplicationWindow = di.inject(createFirstApplicationWindowInjectable);
+    const splashWindow = di.inject(splashWindowInjectable);
+    const openDeepLink = di.inject(openDeepLinkInjectable);
+    const commandLineArguments = di.inject(commandLineArgumentsInjectable);
+
+    return {
+      id: "show-initial-window",
+      run: async () => {
+        if (shouldStartWindow) {
+          const deepLinkUrl = getDeepLinkUrl(commandLineArguments);
+
+          if (deepLinkUrl) {
+            await openDeepLink(deepLinkUrl);
+          } else {
+            const applicationWindow = createFirstApplicationWindow();
+
+            await applicationWindow.start();
+          }
+
+          splashWindow.close();
+        }
+      },
+    };
+  },
+  injectionToken: showInitialWindowRunnablePhaseInjectionToken,
+});
+
+export default showInitialWindowInjectable;
diff --git a/src/main/start-main-application/runnables/show-loading.injectable.ts b/src/main/start-main-application/runnables/show-loading.injectable.ts
new file mode 100644
index 0000000000..2305d4cf3b
--- /dev/null
+++ b/src/main/start-main-application/runnables/show-loading.injectable.ts
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import shouldStartHiddenInjectable from "../../electron-app/features/should-start-hidden.injectable";
+import splashWindowInjectable from "../lens-window/splash-window/splash-window.injectable";
+import { showLoadingRunnablePhaseInjectionToken } from "../runnable-tokens/phases";
+
+const showLoadingInjectable = getInjectable({
+  id: "show-loading",
+  instantiate: (di) => {
+    const shouldStartHidden = di.inject(shouldStartHiddenInjectable);
+    const shouldShowLoadingWindow = !shouldStartHidden;
+    const splashWindow = di.inject(splashWindowInjectable);
+
+    return {
+      id: "show-loading",
+      run: async () => {
+        if (shouldShowLoadingWindow) {
+          await splashWindow.start();
+        }
+      },
+    };
+  },
+  injectionToken: showLoadingRunnablePhaseInjectionToken,
+});
+
+export default showLoadingInjectable;
diff --git a/src/main/start-main-application/runnables/stop-cluster-manager.injectable.ts b/src/main/start-main-application/runnables/stop-cluster-manager.injectable.ts
index d062270dd0..c0a39c51ae 100644
--- a/src/main/start-main-application/runnables/stop-cluster-manager.injectable.ts
+++ b/src/main/start-main-application/runnables/stop-cluster-manager.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import clusterManagerInjectable from "../../cluster-manager.injectable";
+import clusterManagerInjectable from "../../cluster/manager.injectable";
 import { beforeQuitOfFrontEndInjectionToken } from "../runnable-tokens/before-quit-of-front-end-injection-token";
 
 const stopClusterManagerInjectable = getInjectable({
@@ -13,15 +13,16 @@ const stopClusterManagerInjectable = getInjectable({
     const clusterManager = di.inject(clusterManagerInjectable);
 
     return {
+      id: "stop-cluster-manager",
       run: () => {
         clusterManager.stop();
+
+        return undefined;
       },
     };
   },
 
   injectionToken: beforeQuitOfFrontEndInjectionToken,
-
-  causesSideEffects: true,
 });
 
 export default stopClusterManagerInjectable;
diff --git a/src/main/start-main-application/start-main-application.injectable.ts b/src/main/start-main-application/start-main-application.injectable.ts
index fcd1851575..ff52bd0f9d 100644
--- a/src/main/start-main-application/start-main-application.injectable.ts
+++ b/src/main/start-main-application/start-main-application.injectable.ts
@@ -10,13 +10,8 @@ import { beforeElectronIsReadyInjectionToken } from "./runnable-tokens/before-el
 import { beforeApplicationIsLoadingInjectionToken } from "./runnable-tokens/before-application-is-loading-injection-token";
 import { onLoadOfApplicationInjectionToken } from "./runnable-tokens/on-load-of-application-injection-token";
 import { afterApplicationIsLoadedInjectionToken } from "./runnable-tokens/after-application-is-loaded-injection-token";
-import splashWindowInjectable from "./lens-window/splash-window/splash-window.injectable";
-import openDeepLinkInjectable from "../protocol-handler/lens-protocol-router-main/open-deep-link-for-url/open-deep-link.injectable";
-import { pipeline } from "@ogre-tools/fp";
-import { find, map, startsWith, toLower } from "lodash/fp";
-import commandLineArgumentsInjectable from "../utils/command-line-arguments.injectable";
 import waitForElectronToBeReadyInjectable from "../electron-app/features/wait-for-electron-to-be-ready.injectable";
-import createFirstApplicationWindowInjectable from "./lens-window/application-window/create-first-application-window.injectable";
+import { appPathsRunnablePhaseInjectionToken, showInitialWindowRunnablePhaseInjectionToken, showLoadingRunnablePhaseInjectionToken } from "./runnable-tokens/phases";
 
 const startMainApplicationInjectable = getInjectable({
   id: "start-main-application",
@@ -25,53 +20,29 @@ const startMainApplicationInjectable = getInjectable({
     const runMany = runManyFor(di);
     const runManySync = runManySyncFor(di);
     const waitForElectronToBeReady = di.inject(waitForElectronToBeReadyInjectable);
-    const createFirstApplicationWindow = di.inject(createFirstApplicationWindowInjectable);
-    const splashWindow = di.inject(splashWindowInjectable);
-    const openDeepLink = di.inject(openDeepLinkInjectable);
-    const commandLineArguments = di.inject(commandLineArgumentsInjectable);
 
+    const appPathsRunnablePhase = runManySync(appPathsRunnablePhaseInjectionToken);
     const beforeElectronIsReady = runManySync(beforeElectronIsReadyInjectionToken);
     const beforeApplicationIsLoading = runMany(beforeApplicationIsLoadingInjectionToken);
+    const showLoadingRunnablePhase = runMany(showLoadingRunnablePhaseInjectionToken);
     const onLoadOfApplication = runMany(onLoadOfApplicationInjectionToken);
+    const showInitialWindowRunnablePhase = runMany(showInitialWindowRunnablePhaseInjectionToken);
     const afterApplicationIsLoaded = runMany(afterApplicationIsLoadedInjectionToken);
 
-    return (shouldStartWindow: boolean) => {
-      // Stuff happening before application is ready needs to be synchronous because of
-      // https://github.com/electron/electron/issues/21370
-      beforeElectronIsReady();
+    // Stuff happening before application is ready needs to be synchronous because of
+    // https://github.com/electron/electron/issues/21370
+    appPathsRunnablePhase();
+    beforeElectronIsReady();
 
-      return (async () => {
-        await waitForElectronToBeReady();
-
-        await beforeApplicationIsLoading();
-
-        if (shouldStartWindow) {
-          await splashWindow.start();
-        }
-
-        await onLoadOfApplication();
-
-        if (shouldStartWindow) {
-          const deepLinkUrl = getDeepLinkUrl(commandLineArguments);
-
-          if (deepLinkUrl) {
-            await openDeepLink(deepLinkUrl);
-          } else {
-            const applicationWindow = createFirstApplicationWindow();
-
-            await applicationWindow.start();
-          }
-
-          splashWindow.close();
-        }
-
-        await afterApplicationIsLoaded();
-      })();
-    };
+    return (async () => {
+      await waitForElectronToBeReady();
+      await beforeApplicationIsLoading();
+      await showLoadingRunnablePhase();
+      await onLoadOfApplication();
+      await showInitialWindowRunnablePhase();
+      await afterApplicationIsLoaded();
+    })();
   },
 });
 
-const getDeepLinkUrl = (commandLineArguments: string[]) =>
-  pipeline(commandLineArguments, map(toLower), find(startsWith("lens://")));
-
 export default startMainApplicationInjectable;
diff --git a/src/main/stop-services-and-exit-app.injectable.ts b/src/main/stop-services-and-exit-app.injectable.ts
index 25b4324aec..402862b462 100644
--- a/src/main/stop-services-and-exit-app.injectable.ts
+++ b/src/main/stop-services-and-exit-app.injectable.ts
@@ -4,10 +4,10 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import exitAppInjectable from "./electron-app/features/exit-app.injectable";
-import clusterManagerInjectable from "./cluster-manager.injectable";
-import appEventBusInjectable from "../common/app-event-bus/app-event-bus.injectable";
+import clusterManagerInjectable from "./cluster/manager.injectable";
 import loggerInjectable from "../common/logger.injectable";
 import closeAllWindowsInjectable from "./start-main-application/lens-window/hide-all-windows/close-all-windows.injectable";
+import emitAppEventInjectable from "../common/app-event-bus/emit-event.injectable";
 
 const stopServicesAndExitAppInjectable = getInjectable({
   id: "stop-services-and-exit-app",
@@ -15,12 +15,12 @@ const stopServicesAndExitAppInjectable = getInjectable({
   instantiate: (di) => {
     const exitApp = di.inject(exitAppInjectable);
     const clusterManager = di.inject(clusterManagerInjectable);
-    const appEventBus = di.inject(appEventBusInjectable);
     const logger = di.inject(loggerInjectable);
     const closeAllWindows = di.inject(closeAllWindowsInjectable);
+    const emitAppEvent = di.inject(emitAppEventInjectable);
 
     return () => {
-      appEventBus.emit({ name: "service", action: "close" });
+      emitAppEvent({ name: "service", action: "close" });
       closeAllWindows();
       clusterManager.stop();
       logger.info("SERVICE:QUIT");
diff --git a/src/main/stores/init-user-store.injectable.ts b/src/main/stores/init-user-store.injectable.ts
new file mode 100644
index 0000000000..c8d7ec9fe0
--- /dev/null
+++ b/src/main/stores/init-user-store.injectable.ts
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import userStoreFileNameMigrationInjectable from "../../common/user-store/file-name-migration.injectable";
+import userStoreInjectable from "../../common/user-store/user-store.injectable";
+import { beforeApplicationIsLoadingInjectionToken } from "../start-main-application/runnable-tokens/before-application-is-loading-injection-token";
+import initDefaultUpdateChannelInjectable from "../vars/default-update-channel/init.injectable";
+
+const initUserStoreInjectable = getInjectable({
+  id: "init-user-store",
+  instantiate: (di) => {
+    const userStore = di.inject(userStoreInjectable);
+    const userStoreFileNameMigration = di.inject(userStoreFileNameMigrationInjectable);
+
+    return {
+      id: "init-user-store",
+      run: async () => {
+        await userStoreFileNameMigration();
+        userStore.load();
+      },
+      runAfter: di.inject(initDefaultUpdateChannelInjectable),
+    };
+  },
+  injectionToken: beforeApplicationIsLoadingInjectionToken,
+});
+
+export default initUserStoreInjectable;
diff --git a/src/main/theme/broadcast-theme-change/start-broadcasting-theme-change.injectable.ts b/src/main/theme/broadcast-theme-change/start-broadcasting-theme-change.injectable.ts
index 7794c07bd4..e76f251ec2 100644
--- a/src/main/theme/broadcast-theme-change/start-broadcasting-theme-change.injectable.ts
+++ b/src/main/theme/broadcast-theme-change/start-broadcasting-theme-change.injectable.ts
@@ -13,6 +13,7 @@ const startBroadcastingThemeChangeInjectable = getInjectable({
     const broadcastThemeChange = di.inject(broadcastThemeChangeInjectable);
 
     return {
+      id: "start-broadcasting-theme-change",
       run: async () => {
         await broadcastThemeChange.start();
       },
diff --git a/src/main/theme/broadcast-theme-change/stop-broadcasting-theme-change.injectable.ts b/src/main/theme/broadcast-theme-change/stop-broadcasting-theme-change.injectable.ts
index a5f922af13..ede38cb4f1 100644
--- a/src/main/theme/broadcast-theme-change/stop-broadcasting-theme-change.injectable.ts
+++ b/src/main/theme/broadcast-theme-change/stop-broadcasting-theme-change.injectable.ts
@@ -13,9 +13,8 @@ const stopBroadcastingThemeChangeInjectable = getInjectable({
     const broadcastThemeChange = di.inject(broadcastThemeChangeInjectable);
 
     return {
-      run: async () => {
-        await broadcastThemeChange.stop();
-      },
+      id: "stop-broadcasting-theme-change",
+      run: () => void broadcastThemeChange.stop(),
     };
   },
 
diff --git a/src/main/theme/sync-theme-from-os/start-syncing-theme-from-operating-system.injectable.ts b/src/main/theme/sync-theme-from-os/start-syncing-theme-from-operating-system.injectable.ts
index 9bf9c5fe49..adc22c4e1e 100644
--- a/src/main/theme/sync-theme-from-os/start-syncing-theme-from-operating-system.injectable.ts
+++ b/src/main/theme/sync-theme-from-os/start-syncing-theme-from-operating-system.injectable.ts
@@ -13,6 +13,7 @@ const startSyncingThemeFromOperatingSystemInjectable = getInjectable({
     const syncTheme = di.inject(syncThemeFromOperatingSystemInjectable);
 
     return {
+      id: "start-syncing-theme-from-operating-system",
       run: async () => {
         await syncTheme.start();
       },
diff --git a/src/main/theme/sync-theme-from-os/stop-syncing-theme-from-operating-system.injectable.ts b/src/main/theme/sync-theme-from-os/stop-syncing-theme-from-operating-system.injectable.ts
index 08657281c2..b45184a3bd 100644
--- a/src/main/theme/sync-theme-from-os/stop-syncing-theme-from-operating-system.injectable.ts
+++ b/src/main/theme/sync-theme-from-os/stop-syncing-theme-from-operating-system.injectable.ts
@@ -13,9 +13,8 @@ const stopSyncingThemeFromOperatingSystemInjectable = getInjectable({
     const syncTheme = di.inject(syncThemeFromOperatingSystemInjectable);
 
     return {
-      run: async () => {
-        await syncTheme.stop();
-      },
+      id: "stop-syncing-theme-from-operating-system",
+      run: () => void syncTheme.stop(),
     };
   },
 
diff --git a/src/main/tray/electron-tray/electron-tray.injectable.ts b/src/main/tray/electron-tray/electron-tray.injectable.ts
index d8b264060a..96add28ac7 100644
--- a/src/main/tray/electron-tray/electron-tray.injectable.ts
+++ b/src/main/tray/electron-tray/electron-tray.injectable.ts
@@ -4,12 +4,12 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { Menu, Tray } from "electron";
-import packageJsonInjectable from "../../../common/vars/package-json.injectable";
 import showApplicationWindowInjectable from "../../start-main-application/lens-window/show-application-window.injectable";
 import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
 import loggerInjectable from "../../../common/logger.injectable";
 import { convertToElectronMenuTemplate } from "../reactive-tray-menu-items/converters";
 import trayIconInjectable from "../menu-icon/tray-icon.injectable";
+import applicationDescriptionInjectable from "../../../common/vars/application-description.injectable";
 
 const TRAY_LOG_PREFIX = "[TRAY]";
 
@@ -34,7 +34,7 @@ const electronTrayInjectable = getInjectable({
   id: "electron-tray",
 
   instantiate: (di): ElectronTray => {
-    const packageJson = di.inject(packageJsonInjectable);
+    const applicationDescription = di.inject(applicationDescriptionInjectable);
     const showApplicationWindow = di.inject(showApplicationWindowInjectable);
     const isWindows = di.inject(isWindowsInjectable);
     const logger = di.inject(loggerInjectable);
@@ -46,7 +46,7 @@ const electronTrayInjectable = getInjectable({
       start: () => {
         tray = new Tray(trayIcon.get().iconPath);
 
-        tray.setToolTip(packageJson.description);
+        tray.setToolTip(applicationDescription);
         tray.setIgnoreDoubleClickEvents(true);
 
         if (isWindows) {
diff --git a/src/main/tray/electron-tray/start-tray.injectable.ts b/src/main/tray/electron-tray/start-tray.injectable.ts
index 1a223ac3a5..2226205244 100644
--- a/src/main/tray/electron-tray/start-tray.injectable.ts
+++ b/src/main/tray/electron-tray/start-tray.injectable.ts
@@ -13,6 +13,7 @@ const startTrayInjectable = getInjectable({
     const electronTray = di.inject(electronTrayInjectable);
 
     return {
+      id: "start-tray",
       run: () => {
         electronTray.start();
       },
diff --git a/src/main/tray/electron-tray/stop-tray.injectable.ts b/src/main/tray/electron-tray/stop-tray.injectable.ts
index f66ffb3a64..d2e58be039 100644
--- a/src/main/tray/electron-tray/stop-tray.injectable.ts
+++ b/src/main/tray/electron-tray/stop-tray.injectable.ts
@@ -14,10 +14,8 @@ const stopTrayInjectable = getInjectable({
     const electronTray = di.inject(electronTrayInjectable);
 
     return {
-      run: () => {
-        electronTray.stop();
-      },
-
+      id: "stop-tray",
+      run: () => void electronTray.stop(),
       runAfter: di.inject(stopReactiveTrayMenuItemsInjectable),
     };
   },
diff --git a/src/main/tray/menu-icon/get-tray-icon-path.injectable.ts b/src/main/tray/menu-icon/get-tray-icon-path.injectable.ts
index fe2746a2ab..30d2e58858 100644
--- a/src/main/tray/menu-icon/get-tray-icon-path.injectable.ts
+++ b/src/main/tray/menu-icon/get-tray-icon-path.injectable.ts
@@ -3,34 +3,33 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import getAbsolutePathInjectable from "../../../common/path/get-absolute-path.injectable";
 import staticFilesDirectoryInjectable from "../../../common/vars/static-files-directory.injectable";
 import isDevelopmentInjectable from "../../../common/vars/is-development.injectable";
 import isMacInjectable from "../../../common/vars/is-mac.injectable";
 import { camelCase, flow, upperFirst } from "lodash/fp";
+import joinPathsInjectable from "../../../common/path/join-paths.injectable";
 const upperCamelCase = flow(camelCase, upperFirst);
 
 const getTrayIconPathInjectable = getInjectable({
   id: "get-tray-icon-path",
 
   instantiate: (di) => {
-    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
     const staticFilesDirectory = di.inject(staticFilesDirectoryInjectable);
     const isDevelopment = di.inject(isDevelopmentInjectable);
     const isMac = di.inject(isMacInjectable);
 
-    const baseIconDirectory = getAbsolutePath(
+    const baseIconDirectory = joinPaths(
       staticFilesDirectory,
       isDevelopment ? "../build/tray" : "icons", // copied within electron-builder extras
     );
 
     const fileSuffix = isMac ? "Template.png" : ".png";
 
-    return (name: string) =>
-      getAbsolutePath(
-        baseIconDirectory,
-        `trayIcon${upperCamelCase(name)}${fileSuffix}`,
-      );
+    return (name: string) => joinPaths(
+      baseIconDirectory,
+      `trayIcon${upperCamelCase(name)}${fileSuffix}`,
+    );
   },
 });
 
diff --git a/src/main/tray/menu-icon/start-reactivity.injectable.ts b/src/main/tray/menu-icon/start-reactivity.injectable.ts
index 373c3cf8fb..19bc9aec20 100644
--- a/src/main/tray/menu-icon/start-reactivity.injectable.ts
+++ b/src/main/tray/menu-icon/start-reactivity.injectable.ts
@@ -14,6 +14,7 @@ const startReactiveTrayMenuIconInjectable = getInjectable({
     const reactiveTrayMenuIcon = di.inject(reactiveTrayMenuIconInjectable);
 
     return {
+      id: "start-reactive-tray-menu-icon",
       run: async () => {
         await reactiveTrayMenuIcon.start();
       },
diff --git a/src/main/tray/menu-icon/stop-reactivity.injectable.ts b/src/main/tray/menu-icon/stop-reactivity.injectable.ts
index 4b60aaaa54..94e91ec607 100644
--- a/src/main/tray/menu-icon/stop-reactivity.injectable.ts
+++ b/src/main/tray/menu-icon/stop-reactivity.injectable.ts
@@ -13,9 +13,8 @@ const stopReactiveTrayMenuIconInjectable = getInjectable({
     const reactiveTrayMenuIcon = di.inject(reactiveTrayMenuIconInjectable);
 
     return {
-      run: async () => {
-        await reactiveTrayMenuIcon.stop();
-      },
+      id: "stop-reactive-tray-menu-icon",
+      run: () => void reactiveTrayMenuIcon.stop(),
     };
   },
 
diff --git a/src/main/tray/reactive-tray-menu-items/reactive-tray-menu-items.injectable.ts b/src/main/tray/reactive-tray-menu-items/reactive-tray-menu-items.injectable.ts
index 145cc1e870..378bceafd9 100644
--- a/src/main/tray/reactive-tray-menu-items/reactive-tray-menu-items.injectable.ts
+++ b/src/main/tray/reactive-tray-menu-items/reactive-tray-menu-items.injectable.ts
@@ -19,10 +19,8 @@ const reactiveTrayMenuItemsInjectable = getInjectable({
 
     return getStartableStoppable("reactive-tray-menu-items", () =>
       reaction(
-        (): MinimalTrayMenuItem[] => reactiveItems.get().map(toNonReactiveItem),
-
+        () => reactiveItems.get().map(toNonReactiveItem),
         (nonReactiveItems) => electronTray.setMenuItems(nonReactiveItems),
-
         {
           fireImmediately: true,
         },
diff --git a/src/main/tray/reactive-tray-menu-items/start-reactive-tray-menu-items.injectable.ts b/src/main/tray/reactive-tray-menu-items/start-reactive-tray-menu-items.injectable.ts
index 63025e6a9a..634c6cd875 100644
--- a/src/main/tray/reactive-tray-menu-items/start-reactive-tray-menu-items.injectable.ts
+++ b/src/main/tray/reactive-tray-menu-items/start-reactive-tray-menu-items.injectable.ts
@@ -14,8 +14,9 @@ const startReactiveTrayMenuItemsInjectable = getInjectable({
     const reactiveTrayMenuItems = di.inject(reactiveTrayMenuItemsInjectable);
 
     return {
-      run: async () => {
-        await reactiveTrayMenuItems.start();
+      id: "start-reactive-tray-menu-items",
+      run: () => {
+        reactiveTrayMenuItems.start();
       },
 
       runAfter: di.inject(startTrayInjectable),
diff --git a/src/main/tray/reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable.ts b/src/main/tray/reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable.ts
index 384cdc253a..122e9c059a 100644
--- a/src/main/tray/reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable.ts
+++ b/src/main/tray/reactive-tray-menu-items/stop-reactive-tray-menu-items.injectable.ts
@@ -13,9 +13,8 @@ const stopReactiveTrayMenuItemsInjectable = getInjectable({
     const reactiveTrayMenuItems = di.inject(reactiveTrayMenuItemsInjectable);
 
     return {
-      run: async () => {
-        await reactiveTrayMenuItems.stop();
-      },
+      id: "stop-reactive-tray-menu-items",
+      run: () => void reactiveTrayMenuItems.stop(),
     };
   },
 
diff --git a/src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts b/src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts
index 5fb1a9f34f..c6da2c3f14 100644
--- a/src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts
+++ b/src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts
@@ -3,14 +3,14 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import productNameInjectable from "../../../app-paths/app-name/product-name.injectable";
 import showApplicationWindowInjectable from "../../../start-main-application/lens-window/show-application-window.injectable";
-import showAboutInjectable from "../../../menu/show-about.injectable";
+import showAboutInjectable from "../../../../features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/show-about.injectable";
 import { trayMenuItemInjectionToken } from "../tray-menu-item-injection-token";
 import { computed } from "mobx";
 import withErrorLoggingInjectable from "../../../../common/utils/with-error-logging/with-error-logging.injectable";
 import { withErrorSuppression } from "../../../../common/utils/with-error-suppression/with-error-suppression";
 import { pipeline } from "@ogre-tools/fp";
+import productNameInjectable from "../../../../common/vars/product-name.injectable";
 
 const aboutAppTrayItemInjectable = getInjectable({
   id: "about-app-tray-item",
@@ -32,15 +32,10 @@ const aboutAppTrayItemInjectable = getInjectable({
       click: pipeline(
         async () => {
           await showApplicationWindow();
-
-          await showAbout();
+          showAbout();
         },
-
         withErrorLoggingFor(() => "[TRAY]: Opening of show about failed."),
-
-        // TODO: Find out how to improve typing so that instead of
-        // x => withErrorSuppression(x) there could only be withErrorSuppression
-        (x) => withErrorSuppression(x),
+        withErrorSuppression,
       ),
     };
   },
diff --git a/src/main/tray/tray-menu-item/implementations/open-app-tray-item.injectable.ts b/src/main/tray/tray-menu-item/implementations/open-app-tray-item.injectable.ts
index ff19d7718a..9958448796 100644
--- a/src/main/tray/tray-menu-item/implementations/open-app-tray-item.injectable.ts
+++ b/src/main/tray/tray-menu-item/implementations/open-app-tray-item.injectable.ts
@@ -4,12 +4,12 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { trayMenuItemInjectionToken } from "../tray-menu-item-injection-token";
-import productNameInjectable from "../../../app-paths/app-name/product-name.injectable";
 import showApplicationWindowInjectable from "../../../start-main-application/lens-window/show-application-window.injectable";
 import { computed } from "mobx";
 import withErrorLoggingInjectable from "../../../../common/utils/with-error-logging/with-error-logging.injectable";
 import { withErrorSuppression } from "../../../../common/utils/with-error-suppression/with-error-suppression";
 import { pipeline } from "@ogre-tools/fp";
+import productNameInjectable from "../../../../common/vars/product-name.injectable";
 
 const openAppTrayItemInjectable = getInjectable({
   id: "open-app-tray-item",
@@ -28,15 +28,9 @@ const openAppTrayItemInjectable = getInjectable({
       visible: computed(() => true),
 
       click: pipeline(
-        async () => {
-          await showApplicationWindow();
-        },
-
+        showApplicationWindow,
         withErrorLoggingFor(() => "[TRAY]: Opening of application window failed."),
-
-        // TODO: Find out how to improve typing so that instead of
-        // x => withErrorSuppression(x) there could only be withErrorSuppression
-        (x) => withErrorSuppression(x),
+        withErrorSuppression,
       ),
     };
   },
diff --git a/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts b/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts
index f1ebe7885d..573af2f545 100644
--- a/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts
+++ b/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts
@@ -25,9 +25,13 @@ const trayMenuItemRegistratorInjectable = getInjectable({
     const withErrorLoggingFor = di.inject(withErrorLoggingInjectable);
     const getRandomId = di.inject(getRandomIdInjectable);
 
-    return mainExtension.trayMenus.flatMap(
-      toItemInjectablesFor(mainExtension, withErrorLoggingFor, getRandomId),
-    );
+    return computed(() => {
+      const trayMenus = Array.isArray(mainExtension.trayMenus) ? mainExtension.trayMenus : mainExtension.trayMenus.get();
+
+      return trayMenus.flatMap(
+        toItemInjectablesFor(mainExtension, withErrorLoggingFor, getRandomId),
+      );
+    });
   },
 
   injectionToken: extensionRegistratorInjectionToken,
@@ -117,5 +121,3 @@ const toItemInjectablesFor = (extension: LensMainExtension, withErrorLoggingFor:
 
   return _toItemInjectables(null);
 };
-
-
diff --git a/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts b/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts
index 6b7fa9b8df..6ace54c845 100644
--- a/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts
+++ b/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts
@@ -6,8 +6,6 @@ import { getInjectable } from "@ogre-tools/injectable";
 import type { IpcMainEvent } from "electron";
 import ipcMainInjectable from "../ipc-main/ipc-main.injectable";
 import { enlistMessageChannelListenerInjectionToken } from "../../../../common/utils/channel/enlist-message-channel-listener-injection-token";
-import { pipeline } from "@ogre-tools/fp";
-import { tentativeParseJson } from "../../../../common/utils/tentative-parse-json";
 
 const enlistMessageChannelListenerInjectable = getInjectable({
   id: "enlist-message-channel-listener-for-main",
@@ -17,11 +15,7 @@ const enlistMessageChannelListenerInjectable = getInjectable({
 
     return ({ channel, handler }) => {
       const nativeOnCallback = (_: IpcMainEvent, message: unknown) => {
-        pipeline(
-          message,
-          tentativeParseJson,
-          handler,
-        );
+        handler(message);
       };
 
       ipcMain.on(channel.id, nativeOnCallback);
diff --git a/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts b/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts
index 3bd0398d8e..407ffabd8f 100644
--- a/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts
+++ b/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts
@@ -88,8 +88,8 @@ describe("enlist message channel listener in main", () => {
       expect(handlerMock).toHaveBeenCalledWith(true);
     });
 
-    it("given stringified object as message, when message arrives, calls the handler with the message", () => {
-      onMock.mock.calls[0][1]({} as IpcMainEvent, JSON.stringify({ some: "object" }));
+    it("given object as message, when message arrives, calls the handler with the message", () => {
+      onMock.mock.calls[0][1]({} as IpcMainEvent, { some: "object" });
 
       expect(handlerMock).toHaveBeenCalledWith({ some: "object" });
     });
diff --git a/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts b/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts
index 6f118288f3..d72e4afcaf 100644
--- a/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts
+++ b/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts
@@ -5,20 +5,20 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { IpcMainInvokeEvent } from "electron";
 import ipcMainInjectable from "../ipc-main/ipc-main.injectable";
-import { enlistRequestChannelListenerInjectionToken } from "../../../../common/utils/channel/enlist-request-channel-listener-injection-token";
-import { pipeline } from "@ogre-tools/fp";
-import { tentativeParseJson } from "../../../../common/utils/tentative-parse-json";
-import { tentativeStringifyJson } from "../../../../common/utils/tentative-stringify-json";
+import type { Disposer } from "../../../../common/utils";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+import type { RequestChannelListener } from "./listener-tokens";
+
+export type EnlistRequestChannelListener = <TChannel extends RequestChannel<unknown, unknown>>(listener: RequestChannelListener<TChannel>) => Disposer;
 
 const enlistRequestChannelListenerInjectable = getInjectable({
   id: "enlist-request-channel-listener-for-main",
 
-  instantiate: (di) => {
+  instantiate: (di): EnlistRequestChannelListener => {
     const ipcMain = di.inject(ipcMainInjectable);
 
     return ({ channel, handler }) => {
-      const nativeHandleCallback = (_: IpcMainInvokeEvent, request: unknown) =>
-        pipeline(request, tentativeParseJson, handler, tentativeStringifyJson);
+      const nativeHandleCallback = (_: IpcMainInvokeEvent, request: unknown) => handler(request);
 
       ipcMain.handle(channel.id, nativeHandleCallback);
 
@@ -27,8 +27,6 @@ const enlistRequestChannelListenerInjectable = getInjectable({
       };
     };
   },
-
-  injectionToken: enlistRequestChannelListenerInjectionToken,
 });
 
 export default enlistRequestChannelListenerInjectable;
diff --git a/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.test.ts b/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.test.ts
index 12a5e9af74..2c13bbd8f9 100644
--- a/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.test.ts
+++ b/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.test.ts
@@ -5,11 +5,19 @@
 import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
 import ipcMainInjectable from "../ipc-main/ipc-main.injectable";
 import type { IpcMain, IpcMainInvokeEvent } from "electron";
-import type { EnlistRequestChannelListener } from "../../../../common/utils/channel/enlist-request-channel-listener-injection-token";
-import { enlistRequestChannelListenerInjectionToken } from "../../../../common/utils/channel/enlist-request-channel-listener-injection-token";
 import { getPromiseStatus } from "../../../../common/test-utils/get-promise-status";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+import type { EnlistRequestChannelListener } from "./enlist-request-channel-listener.injectable";
+import enlistRequestChannelListenerInjectable from "./enlist-request-channel-listener.injectable";
+import type { RequestChannelHandler } from "./listener-tokens";
+
+type TestRequestChannel = RequestChannel<unknown, unknown>;
+
+const testRequestChannel: TestRequestChannel = {
+  id: "some-channel-id",
+};
 
 describe("enlist request channel listener in main", () => {
   let enlistRequestChannelListener: EnlistRequestChannelListener;
@@ -30,20 +38,18 @@ describe("enlist request channel listener in main", () => {
 
     di.override(ipcMainInjectable, () => ipcMainStub);
 
-    enlistRequestChannelListener = di.inject(
-      enlistRequestChannelListenerInjectionToken,
-    );
+    enlistRequestChannelListener = di.inject(enlistRequestChannelListenerInjectable);
   });
 
   describe("when called", () => {
-    let handlerMock: AsyncFnMock<(message: any) => any>;
+    let handlerMock: AsyncFnMock<RequestChannelHandler<TestRequestChannel>>;
     let disposer: () => void;
 
     beforeEach(() => {
       handlerMock = asyncFn();
 
       disposer = enlistRequestChannelListener({
-        channel: { id: "some-channel-id" },
+        channel: testRequestChannel,
         handler: handlerMock,
       });
     });
@@ -91,7 +97,7 @@ describe("enlist request channel listener in main", () => {
         it("resolves with the response", async () => {
           const actual = await actualPromise;
 
-          expect(actual).toBe('"some-response"');
+          expect(actual).toBe("some-response");
         });
 
         it("when disposing the listener, de-registers the listener", () => {
@@ -106,7 +112,7 @@ describe("enlist request channel listener in main", () => {
 
         const actual = await actualPromise;
 
-        expect(actual).toBe("42");
+        expect(actual).toBe(42);
       });
 
       it("given boolean as response, when handler resolves with response, listener resolves with stringified response", async () => {
@@ -114,15 +120,15 @@ describe("enlist request channel listener in main", () => {
 
         const actual = await actualPromise;
 
-        expect(actual).toBe("true");
+        expect(actual).toBe(true);
       });
 
-      it("given object as response, when handler resolves with response, listener resolves with stringified response", async () => {
+      it("given object as response, when handler resolves with response, listener resolves with response", async () => {
         await handlerMock.resolve({ some: "object" });
 
         const actual = await actualPromise;
 
-        expect(actual).toBe(JSON.stringify({ some: "object" }));
+        expect(actual).toEqual({ some: "object" });
       });
     });
 
@@ -138,8 +144,8 @@ describe("enlist request channel listener in main", () => {
       expect(handlerMock).toHaveBeenCalledWith(true);
     });
 
-    it("given stringified object as request, when request arrives, calls the handler with the request", () => {
-      handleMock.mock.calls[0][1]({} as IpcMainInvokeEvent, JSON.stringify({ some: "object" }));
+    it("given object as request, when request arrives, calls the handler with the request", () => {
+      handleMock.mock.calls[0][1]({} as IpcMainInvokeEvent, { some: "object" });
 
       expect(handlerMock).toHaveBeenCalledWith({ some: "object" });
     });
diff --git a/src/main/utils/channel/channel-listeners/listener-tokens.ts b/src/main/utils/channel/channel-listeners/listener-tokens.ts
new file mode 100644
index 0000000000..a3cd5af4f4
--- /dev/null
+++ b/src/main/utils/channel/channel-listeners/listener-tokens.ts
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { DiContainerForInjection } from "@ogre-tools/injectable";
+import { getInjectable, getInjectionToken } from "@ogre-tools/injectable";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+
+export type RequestChannelHandler<Channel> = Channel extends RequestChannel<infer Request, infer Response>
+  ? (req: Request) => Promise<Response> | Response
+  : never;
+
+export interface RequestChannelListener<Channel> {
+  channel: Channel;
+  handler: RequestChannelHandler<Channel>;
+}
+
+
+export const requestChannelListenerInjectionToken = getInjectionToken<RequestChannelListener<RequestChannel<unknown, unknown>>>( {
+  id: "request-channel-listener",
+});
+
+export interface GetRequestChannelListenerInjectableInfo<
+  Channel extends RequestChannel<Request, Response>,
+  Request,
+  Response,
+> {
+  channel: Channel;
+  handler: (di: DiContainerForInjection) => RequestChannelHandler<Channel>;
+}
+
+export function getRequestChannelListenerInjectable<
+  Channel extends RequestChannel<Request, Response>,
+  Request,
+  Response,
+>(info: GetRequestChannelListenerInjectableInfo<Channel, Request, Response>) {
+  return getInjectable({
+    id: `${info.channel.id}-listener`,
+    instantiate: (di) => ({
+      channel: info.channel,
+      handler: info.handler(di),
+    }),
+    injectionToken: requestChannelListenerInjectionToken,
+  });
+}
diff --git a/src/main/utils/channel/channel-listeners/listening-on-request-channels.injectable.ts b/src/main/utils/channel/channel-listeners/listening-on-request-channels.injectable.ts
new file mode 100644
index 0000000000..80b94fbe0e
--- /dev/null
+++ b/src/main/utils/channel/channel-listeners/listening-on-request-channels.injectable.ts
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { disposer } from "../../../../common/utils";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+import { getStartableStoppable } from "../../../../common/utils/get-startable-stoppable";
+import enlistRequestChannelListenerInjectable from "./enlist-request-channel-listener.injectable";
+import { requestChannelListenerInjectionToken } from "./listener-tokens";
+
+const listeningOnRequestChannelsInjectable = getInjectable({
+  id: "listening-on-request-channels",
+  instantiate: (di) => {
+    const enlistRequestChannelListener = di.inject(enlistRequestChannelListenerInjectable);
+    const requestChannelListeners = di.injectMany(requestChannelListenerInjectionToken);
+
+    return getStartableStoppable("listening-on-request-channels", () => {
+      const seenChannels = new Set<RequestChannel<unknown, unknown>>();
+
+      for (const listener of requestChannelListeners) {
+        if (seenChannels.has(listener.channel)) {
+          throw new Error(`Tried to register a multiple channel handlers for "${listener.channel.id}", only one handler is supported for a request channel.`);
+        }
+
+        seenChannels.add(listener.channel);
+      }
+
+      return disposer(requestChannelListeners.map(enlistRequestChannelListener));
+    });
+  },
+});
+
+export default listeningOnRequestChannelsInjectable;
diff --git a/src/main/utils/channel/channel-listeners/start-listening-of-channels.injectable.ts b/src/main/utils/channel/channel-listeners/start-listening-of-channels.injectable.ts
deleted file mode 100644
index 96fea0a2f0..0000000000
--- a/src/main/utils/channel/channel-listeners/start-listening-of-channels.injectable.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { onLoadOfApplicationInjectionToken } from "../../../start-main-application/runnable-tokens/on-load-of-application-injection-token";
-import listeningOfChannelsInjectable from "../../../../common/utils/channel/listening-of-channels.injectable";
-
-const startListeningOfChannelsInjectable = getInjectable({
-  id: "start-listening-of-channels-main",
-
-  instantiate: (di) => {
-    const listeningOfChannels = di.inject(listeningOfChannelsInjectable);
-
-    return {
-      run: async () => {
-        await listeningOfChannels.start();
-      },
-    };
-  },
-
-  injectionToken: onLoadOfApplicationInjectionToken,
-});
-
-export default startListeningOfChannelsInjectable;
diff --git a/src/main/utils/channel/channel-listeners/start-listening-on-channels.injectable.ts b/src/main/utils/channel/channel-listeners/start-listening-on-channels.injectable.ts
new file mode 100644
index 0000000000..ce6008add4
--- /dev/null
+++ b/src/main/utils/channel/channel-listeners/start-listening-on-channels.injectable.ts
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { onLoadOfApplicationInjectionToken } from "../../../start-main-application/runnable-tokens/on-load-of-application-injection-token";
+import listeningOnMessageChannelsInjectable from "../../../../common/utils/channel/listening-on-message-channels.injectable";
+import listeningOnRequestChannelsInjectable from "./listening-on-request-channels.injectable";
+
+const startListeningOnChannelsInjectable = getInjectable({
+  id: "start-listening-on-channels-main",
+
+  instantiate: (di) => {
+    const listeningOnMessageChannels = di.inject(listeningOnMessageChannelsInjectable);
+    const listeningOnRequestChannels = di.inject(listeningOnRequestChannelsInjectable);
+
+    return {
+      id: "start-listening-on-channels-main",
+      run: () => {
+        listeningOnMessageChannels.start();
+        listeningOnRequestChannels.start();
+      },
+    };
+  },
+
+  injectionToken: onLoadOfApplicationInjectionToken,
+});
+
+export default startListeningOnChannelsInjectable;
diff --git a/src/main/utils/channel/message-to-channel.injectable.ts b/src/main/utils/channel/message-to-channel.injectable.ts
index cbcdc2badd..1435ea59b5 100644
--- a/src/main/utils/channel/message-to-channel.injectable.ts
+++ b/src/main/utils/channel/message-to-channel.injectable.ts
@@ -3,9 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { messageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
-import type { MessageChannel } from "../../../common/utils/channel/message-channel-injection-token";
-import { tentativeStringifyJson } from "../../../common/utils/tentative-stringify-json";
+import type { SendMessageToChannel } from "../../../common/utils/channel/message-to-channel-injection-token";
+import { sendMessageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
 import getVisibleWindowsInjectable from "../../start-main-application/lens-window/get-visible-windows.injectable";
 
 const messageToChannelInjectable = getInjectable({
@@ -14,18 +13,14 @@ const messageToChannelInjectable = getInjectable({
   instantiate: (di) => {
     const getVisibleWindows = di.inject(getVisibleWindowsInjectable);
 
-    // TODO: Figure out way to improve typing in internals
-    // Notice that this should be injected using "messageToChannelInjectionToken" which is typed correctly.
-    return (channel: MessageChannel<any>, message?: unknown) => {
-      const stringifiedMessage = tentativeStringifyJson(message);
-
-      getVisibleWindows().forEach((lensWindow) =>
-        lensWindow.send({ channel: channel.id, data: stringifiedMessage ? [stringifiedMessage] : [] }),
-      );
-    };
+    return ((channel, data) => {
+      for (const window of getVisibleWindows()) {
+        window.send({ channel: channel.id, data });
+      }
+    }) as SendMessageToChannel;
   },
 
-  injectionToken: messageToChannelInjectionToken,
+  injectionToken: sendMessageToChannelInjectionToken,
 });
 
 export default messageToChannelInjectable;
diff --git a/src/main/utils/channel/message-to-channel.test.ts b/src/main/utils/channel/message-to-channel.test.ts
deleted file mode 100644
index 6d5e83a548..0000000000
--- a/src/main/utils/channel/message-to-channel.test.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { MessageToChannel } from "../../../common/utils/channel/message-to-channel-injection-token";
-import { messageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
-import type { MessageChannel } from "../../../common/utils/channel/message-channel-injection-token";
-import type { LensWindow } from "../../start-main-application/lens-window/application-window/create-lens-window.injectable";
-import sendToChannelInElectronBrowserWindowInjectable from "../../start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable";
-import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
-
-describe("message to channel from main", () => {
-  let messageToChannel: MessageToChannel;
-  let someTestWindow: LensWindow;
-  let someOtherTestWindow: LensWindow;
-  let sendToChannelInBrowserMock: jest.Mock;
-
-  beforeEach(async () => {
-    const builder = getApplicationBuilder();
-
-    sendToChannelInBrowserMock = jest.fn();
-
-    builder.beforeApplicationStart(mainDi => {
-      mainDi.override(sendToChannelInElectronBrowserWindowInjectable, () => sendToChannelInBrowserMock);
-    });
-
-    await builder.startHidden();
-
-    someTestWindow = builder.applicationWindow.create("some-test-window-id");
-    someOtherTestWindow = builder.applicationWindow.create("some-other-test-window-id");
-
-    messageToChannel = builder.mainDi.inject(messageToChannelInjectionToken);
-  });
-
-  it("given no visible windows, when messaging to channel, does not message to any window", () => {
-    messageToChannel(someChannel, "some-message");
-
-    expect(sendToChannelInBrowserMock).not.toHaveBeenCalled();
-  });
-
-  describe("given started window", () => {
-    beforeEach(async () => {
-      await someTestWindow.start();
-    });
-
-    it("when messaging to channel, messages to window", () => {
-      messageToChannel(someChannel, "some-message");
-
-      expect(sendToChannelInBrowserMock.mock.calls).toEqual([
-        [
-          "some-test-window-id",
-
-          null,
-
-          {
-            channel: "some-channel",
-            data: ['"some-message"'],
-          },
-        ],
-      ]);
-    });
-
-    it("given boolean as message, when messaging to channel, messages to window with stringified message", () => {
-      messageToChannel(someChannel, true);
-
-      expect(sendToChannelInBrowserMock.mock.calls).toEqual([
-        [
-          "some-test-window-id",
-
-          null,
-
-          {
-            channel: "some-channel",
-            data: ["true"],
-          },
-        ],
-      ]);
-    });
-
-    it("given number as message, when messaging to channel, messages to window with stringified message", () => {
-      messageToChannel(someChannel, 42);
-
-      expect(sendToChannelInBrowserMock.mock.calls).toEqual([
-        [
-          "some-test-window-id",
-
-          null,
-
-          {
-            channel: "some-channel",
-            data: ["42"],
-          },
-        ],
-      ]);
-    });
-
-    it("given object as message, when messaging to channel, messages to window with stringified message", () => {
-      messageToChannel(someChannel, { some: "object" });
-
-      expect(sendToChannelInBrowserMock.mock.calls).toEqual([
-        [
-          "some-test-window-id",
-
-          null,
-
-          {
-            channel: "some-channel",
-            data: [JSON.stringify({ some: "object" })],
-          },
-        ],
-      ]);
-    });
-  });
-
-  it("given multiple started windows, when messaging to channel, messages to window", async () => {
-    await someTestWindow.start();
-    await someOtherTestWindow.start();
-
-    messageToChannel(someChannel, "some-message");
-
-    expect(sendToChannelInBrowserMock.mock.calls).toEqual([
-      [
-        "some-test-window-id",
-
-        null,
-
-        {
-          channel: "some-channel",
-          data: ['"some-message"'],
-        },
-      ],
-
-      [
-        "some-other-test-window-id",
-
-        null,
-
-        {
-          channel: "some-channel",
-          data: ['"some-message"'],
-        },
-      ],
-    ]);
-  });
-});
-
-const someChannel: MessageChannel<any> = { id: "some-channel" };
diff --git a/src/main/utils/clear-kube-env-vars.ts b/src/main/utils/clear-kube-env-vars.ts
index fab11be4e1..f678f44807 100644
--- a/src/main/utils/clear-kube-env-vars.ts
+++ b/src/main/utils/clear-kube-env-vars.ts
@@ -13,7 +13,7 @@ const anyKubeconfig = /^kubeconfig$/i;
  * before KUBECONFIG and we only set KUBECONFIG.
  * @param env The current copy of env
  */
-export function clearKubeconfigEnvVars(env: Record<string, any>): Record<string, any> {
+export function clearKubeconfigEnvVars(env: Partial<Record<string, string>>): Partial<Record<string, string>> {
   return Object.fromEntries(
     Object.entries(env)
       .filter(([key]) => anyKubeconfig.exec(key) === null),
diff --git a/src/main/utils/resolve-system-proxy/resolve-system-proxy-channel-responder.injectable.ts b/src/main/utils/resolve-system-proxy/resolve-system-proxy-channel-responder.injectable.ts
index c7a1747770..a2cd605633 100644
--- a/src/main/utils/resolve-system-proxy/resolve-system-proxy-channel-responder.injectable.ts
+++ b/src/main/utils/resolve-system-proxy/resolve-system-proxy-channel-responder.injectable.ts
@@ -2,20 +2,13 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import resolveSystemProxyChannelInjectable from "../../../common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable";
+import { resolveSystemProxyChannel } from "../../../common/utils/resolve-system-proxy/resolve-system-proxy-channel";
+import { getRequestChannelListenerInjectable } from "../channel/channel-listeners/listener-tokens";
 import resolveSystemProxyInjectable from "./resolve-system-proxy.injectable";
-import { requestChannelListenerInjectionToken } from "../../../common/utils/channel/request-channel-listener-injection-token";
 
-const resolveSystemProxyChannelResponderInjectable = getInjectable({
-  id: "resolve-system-proxy-channel-responder",
-
-  instantiate: (di) => ({
-    channel: di.inject(resolveSystemProxyChannelInjectable),
-    handler: di.inject(resolveSystemProxyInjectable),
-  }),
-
-  injectionToken: requestChannelListenerInjectionToken,
+const resolveSystemProxyChannelResponderInjectable = getRequestChannelListenerInjectable({
+  channel: resolveSystemProxyChannel,
+  handler: (di) => di.inject(resolveSystemProxyInjectable),
 });
 
 export default resolveSystemProxyChannelResponderInjectable;
diff --git a/src/main/utils/shell-env.ts b/src/main/utils/shell-env.ts
deleted file mode 100644
index abcbeb5bed..0000000000
--- a/src/main/utils/shell-env.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import shellEnvironment from "shell-env";
-import logger from "../logger";
-
-export type EnvironmentVariables = Partial<Record<string, string>>;
-
-let shellSyncFailed = false;
-
-/**
- * Attempts to get the shell environment per the user's existing startup scripts.
- * If the environment can't be retrieved after 5 seconds an error message is logged.
- * Subsequent calls after such a timeout simply log an error message without trying
- * to get the environment, unless forceRetry is true.
- * @param shell the shell to get the environment from
- * @param forceRetry if true will always try to get the environment, otherwise if
- * a previous call to this function failed then this call will fail too.
- * @returns object containing the shell's environment variables. An empty object is
- * returned if the call fails.
- */
-export async function shellEnv(shell?: string, forceRetry = false) : Promise<EnvironmentVariables> {
-  if (forceRetry) {
-    shellSyncFailed = false;
-  }
-
-  if (!shellSyncFailed) {
-    try {
-      return await Promise.race([
-        shellEnvironment(shell),
-        new Promise<EnvironmentVariables>((_resolve, reject) => setTimeout(() => {
-          reject(new Error("Resolving shell environment is taking very long. Please review your shell configuration."));
-        }, 30_000)),
-      ]);
-    } catch (error) {
-      logger.error(`shellEnv: ${error}`);
-      shellSyncFailed = true;
-    }
-  } else {
-    logger.error("shellSync(): Resolving shell environment took too long. Please review your shell configuration.");
-  }
-
-  return {};
-}
diff --git a/src/main/utils/sync-box/sync-box-initial-value-channel-listener.injectable.ts b/src/main/utils/sync-box/sync-box-initial-value-channel-listener.injectable.ts
index 5eb043291a..da78d76c36 100644
--- a/src/main/utils/sync-box/sync-box-initial-value-channel-listener.injectable.ts
+++ b/src/main/utils/sync-box/sync-box-initial-value-channel-listener.injectable.ts
@@ -2,30 +2,20 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
-import syncBoxInitialValueChannelInjectable from "../../../common/utils/sync-box/sync-box-initial-value-channel.injectable";
+import { syncBoxInitialValueChannel } from "../../../common/utils/sync-box/channels";
 import { syncBoxInjectionToken } from "../../../common/utils/sync-box/sync-box-injection-token";
-import { requestChannelListenerInjectionToken } from "../../../common/utils/channel/request-channel-listener-injection-token";
+import { getRequestChannelListenerInjectable } from "../channel/channel-listeners/listener-tokens";
 
-const syncBoxInitialValueChannelListenerInjectable = getInjectable({
-  id: "sync-box-initial-value-channel-listener",
-
-  instantiate: (di) => {
-    const channel = di.inject(syncBoxInitialValueChannelInjectable);
+const syncBoxInitialValueChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: syncBoxInitialValueChannel,
+  handler: (di) => {
     const syncBoxes = di.injectMany(syncBoxInjectionToken);
 
-    return {
-      channel,
-
-      handler: () =>
-        syncBoxes.map((box) => ({
-          id: box.id,
-          value: box.value.get(),
-        })),
-    };
+    return () => syncBoxes.map((box) => ({
+      id: box.id,
+      value: box.value.get(),
+    }));
   },
-
-  injectionToken: requestChannelListenerInjectionToken,
 });
 
 export default syncBoxInitialValueChannelListenerInjectable;
diff --git a/src/main/vars/build-version/build-version.injectable.ts b/src/main/vars/build-version/build-version.injectable.ts
new file mode 100644
index 0000000000..5e560282b9
--- /dev/null
+++ b/src/main/vars/build-version/build-version.injectable.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { createInitializableState } from "../../../common/initializable-state/create";
+import { buildVersionInjectionToken } from "../../../common/vars/build-semantic-version.injectable";
+import getBuildVersionInjectable from "./get-build-version.injectable";
+
+const buildVersionInjectable = createInitializableState({
+  id: "build-version",
+  init: (di) => {
+    const getBuildVersion = di.inject(getBuildVersionInjectable);
+
+    return getBuildVersion();
+  },
+  injectionToken: buildVersionInjectionToken,
+});
+
+export default buildVersionInjectable;
diff --git a/src/main/vars/build-version/get-build-version.injectable.ts b/src/main/vars/build-version/get-build-version.injectable.ts
new file mode 100644
index 0000000000..ddbef55262
--- /dev/null
+++ b/src/main/vars/build-version/get-build-version.injectable.ts
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import electronAppInjectable from "../../electron-app/electron-app.injectable";
+
+const getBuildVersionInjectable = getInjectable({
+  id: "get-build-version",
+  instantiate: (di) => {
+    const electronApp = di.inject(electronAppInjectable);
+
+    return () => electronApp.getVersion();
+  },
+});
+
+export default getBuildVersionInjectable;
diff --git a/src/main/vars/build-version/init.injectable.ts b/src/main/vars/build-version/init.injectable.ts
new file mode 100644
index 0000000000..f53e735a47
--- /dev/null
+++ b/src/main/vars/build-version/init.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { beforeApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/before-application-is-loading-injection-token";
+import buildVersionInjectable from "./build-version.injectable";
+
+const initializeBuildVersionInjectable = getInjectable({
+  id: "initialize-build-version",
+  instantiate: (di) => {
+    const buildVersion = di.inject(buildVersionInjectable);
+
+    return {
+      id: "initialize-build-version",
+      run: () => buildVersion.init(),
+    };
+  },
+  injectionToken: beforeApplicationIsLoadingInjectionToken,
+});
+
+export default initializeBuildVersionInjectable;
diff --git a/src/main/vars/default-update-channel/init.injectable.ts b/src/main/vars/default-update-channel/init.injectable.ts
new file mode 100644
index 0000000000..56e90252f3
--- /dev/null
+++ b/src/main/vars/default-update-channel/init.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { beforeApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/before-application-is-loading-injection-token";
+import initReleaseChannelInjectable from "../release-channel/init.injectable";
+import defaultUpdateChannelInjectable from "../../../features/application-update/common/selected-update-channel/default-update-channel.injectable";
+
+const initDefaultUpdateChannelInjectable = getInjectable({
+  id: "init-default-update-channel",
+  instantiate: (di) => {
+    const defaultUpdateChannel = di.inject(defaultUpdateChannelInjectable);
+
+    return {
+      id: "init-default-update-channel",
+      run: () => defaultUpdateChannel.init(),
+      runAfter: di.inject(initReleaseChannelInjectable),
+    };
+  },
+  injectionToken: beforeApplicationIsLoadingInjectionToken,
+});
+
+export default initDefaultUpdateChannelInjectable;
diff --git a/src/main/vars/release-channel/init.injectable.ts b/src/main/vars/release-channel/init.injectable.ts
new file mode 100644
index 0000000000..59527d2194
--- /dev/null
+++ b/src/main/vars/release-channel/init.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import releaseChannelInjectable from "../../../common/vars/release-channel.injectable";
+import { beforeApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/before-application-is-loading-injection-token";
+import initSemanticBuildVersionInjectable from "../semantic-build-version/init.injectable";
+
+const initReleaseChannelInjectable = getInjectable({
+  id: "init-release-channel",
+  instantiate: (di) => {
+    const releaseChannel = di.inject(releaseChannelInjectable);
+
+    return {
+      id: "init-release-channel",
+      run: () => releaseChannel.init(),
+      runAfter: di.inject(initSemanticBuildVersionInjectable),
+    };
+  },
+  injectionToken: beforeApplicationIsLoadingInjectionToken,
+});
+
+export default initReleaseChannelInjectable;
diff --git a/src/main/vars/semantic-build-version/init.injectable.ts b/src/main/vars/semantic-build-version/init.injectable.ts
new file mode 100644
index 0000000000..ee822a8796
--- /dev/null
+++ b/src/main/vars/semantic-build-version/init.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import buildSemanticVersionInjectable from "../../../common/vars/build-semantic-version.injectable";
+import { beforeApplicationIsLoadingInjectionToken } from "../../start-main-application/runnable-tokens/before-application-is-loading-injection-token";
+import initializeBuildVersionInjectable from "../build-version/init.injectable";
+
+const initSemanticBuildVersionInjectable = getInjectable({
+  id: "init-semantic-build-version",
+  instantiate: (di) => {
+    const buildSemanticVersion = di.inject(buildSemanticVersionInjectable);
+
+    return {
+      id: "init-semantic-build-version",
+      run: () => buildSemanticVersion.init(),
+      runAfter: di.inject(initializeBuildVersionInjectable),
+    };
+  },
+  injectionToken: beforeApplicationIsLoadingInjectionToken,
+});
+
+export default initSemanticBuildVersionInjectable;
diff --git a/src/migrations/cluster-store/3.6.0-beta.1.ts b/src/migrations/cluster-store/3.6.0-beta.1.ts
index 09dbd1fd61..5f6bdbc9b7 100644
--- a/src/migrations/cluster-store/3.6.0-beta.1.ts
+++ b/src/migrations/cluster-store/3.6.0-beta.1.ts
@@ -6,9 +6,8 @@
 // Move embedded kubeconfig into separate file and add reference to it to cluster settings
 // convert file path cluster icons to their base64 encoded versions
 
-import path from "path";
 import fse from "fs-extra";
-import { loadConfigFromFileSync } from "../../common/kube-helpers";
+import { loadConfigFromString } from "../../common/kube-helpers";
 import type { MigrationDeclaration } from "../helpers";
 import { migrationLog } from "../helpers";
 import type { ClusterModel } from "../../common/cluster-types";
@@ -19,6 +18,8 @@ import directoryForKubeConfigsInjectable
   from "../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
 import getCustomKubeConfigDirectoryInjectable
   from "../../common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable";
+import readFileSyncInjectable from "../../common/fs/read-file-sync.injectable";
+import joinPathsInjectable from "../../common/path/join-paths.injectable";
 
 interface Pre360ClusterModel extends ClusterModel {
   kubeConfig?: string;
@@ -32,6 +33,8 @@ export default {
     const userDataPath = di.inject(directoryForUserDataInjectable);
     const kubeConfigsPath = di.inject(directoryForKubeConfigsInjectable);
     const getCustomKubeConfigDirectory = di.inject(getCustomKubeConfigDirectoryInjectable);
+    const readFileSync = di.inject(readFileSyncInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
 
     const storedClusters: Pre360ClusterModel[] = store.get("clusters") ?? [];
     const migratedClusters: ClusterModel[] = [];
@@ -55,7 +58,7 @@ export default {
         fse.writeFileSync(absPath, clusterModel.kubeConfig, { encoding: "utf-8", mode: 0o600 });
 
         clusterModel.kubeConfigPath = absPath;
-        clusterModel.contextName = loadConfigFromFileSync(clusterModel.kubeConfigPath).config.getCurrentContext();
+        clusterModel.contextName = loadConfigFromString(readFileSync(absPath)).config.getCurrentContext();
         delete clusterModel.kubeConfig;
 
       } catch (error) {
@@ -71,7 +74,7 @@ export default {
         if (clusterModel.preferences?.icon) {
           migrationLog(`migrating ${clusterModel.preferences.icon} for ${clusterModel.preferences.clusterName}`);
           const iconPath = clusterModel.preferences.icon.replace("store://", "");
-          const fileData = fse.readFileSync(path.join(userDataPath, iconPath));
+          const fileData = fse.readFileSync(joinPaths(userDataPath, iconPath));
 
           clusterModel.preferences.icon = `data:;base64,${fileData.toString("base64")}`;
         } else {
diff --git a/src/migrations/cluster-store/5.0.0-beta.10.ts b/src/migrations/cluster-store/5.0.0-beta.10.ts
index 9172969a85..97b94dc7f7 100644
--- a/src/migrations/cluster-store/5.0.0-beta.10.ts
+++ b/src/migrations/cluster-store/5.0.0-beta.10.ts
@@ -3,13 +3,13 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import path from "path";
 import fse from "fs-extra";
 import type { ClusterModel } from "../../common/cluster-types";
 import type { MigrationDeclaration } from "../helpers";
 import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import { isErrnoException } from "../../common/utils";
+import joinPathsInjectable from "../../common/path/join-paths.injectable";
 
 interface Pre500WorkspaceStoreModel {
   workspaces: {
@@ -24,9 +24,10 @@ export default {
     const di = getLegacyGlobalDiForExtensionApi();
 
     const userDataPath = di.inject(directoryForUserDataInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
 
     try {
-      const workspaceData: Pre500WorkspaceStoreModel = fse.readJsonSync(path.join(userDataPath, "lens-workspace-store.json"));
+      const workspaceData: Pre500WorkspaceStoreModel = fse.readJsonSync(joinPaths(userDataPath, "lens-workspace-store.json"));
       const workspaces = new Map<string, string>(); // mapping from WorkspaceId to name
 
       for (const { id, name } of workspaceData.workspaces) {
diff --git a/src/migrations/cluster-store/5.0.0-beta.13.ts b/src/migrations/cluster-store/5.0.0-beta.13.ts
index dc85a04718..87d88b143a 100644
--- a/src/migrations/cluster-store/5.0.0-beta.13.ts
+++ b/src/migrations/cluster-store/5.0.0-beta.13.ts
@@ -7,12 +7,11 @@ import type { ClusterModel, ClusterPreferences, ClusterPrometheusPreferences } f
 import type { MigrationDeclaration } from "../helpers";
 import { migrationLog } from "../helpers";
 import { generateNewIdFor } from "../utils";
-import path from "path";
 import { moveSync, removeSync } from "fs-extra";
 import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
-import directoryForUserDataInjectable
-  from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import { isDefined } from "../../common/utils";
+import joinPathsInjectable from "../../common/path/join-paths.injectable";
 
 function mergePrometheusPreferences(left: ClusterPrometheusPreferences, right: ClusterPrometheusPreferences): ClusterPrometheusPreferences {
   if (left.prometheus && left.prometheusProvider) {
@@ -79,29 +78,29 @@ function mergeClusterModel(prev: ClusterModel, right: Omit<ClusterModel, "id">):
   };
 }
 
-function moveStorageFolder({ folder, newId, oldId }: { folder: string; newId: string; oldId: string }): void {
-  const oldPath = path.resolve(folder, `${oldId}.json`);
-  const newPath = path.resolve(folder, `${newId}.json`);
-
-  try {
-    moveSync(oldPath, newPath);
-  } catch (error) {
-    if (String(error).includes("dest already exists")) {
-      migrationLog(`Multiple old lens-local-storage files for newId=${newId}. Removing ${oldId}.json`);
-      removeSync(oldPath);
-    }
-  }
-}
-
 export default {
   version: "5.0.0-beta.13",
   run(store) {
     const di = getLegacyGlobalDiForExtensionApi();
 
     const userDataPath = di.inject(directoryForUserDataInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
 
-    const folder = path.resolve(userDataPath, "lens-local-storage");
+    const moveStorageFolder = ({ folder, newId, oldId }: { folder: string; newId: string; oldId: string }): void => {
+      const oldPath = joinPaths(folder, `${oldId}.json`);
+      const newPath = joinPaths(folder, `${newId}.json`);
 
+      try {
+        moveSync(oldPath, newPath);
+      } catch (error) {
+        if (String(error).includes("dest already exists")) {
+          migrationLog(`Multiple old lens-local-storage files for newId=${newId}. Removing ${oldId}.json`);
+          removeSync(oldPath);
+        }
+      }
+    };
+
+    const folder = joinPaths(userDataPath, "lens-local-storage");
     const oldClusters: ClusterModel[] = store.get("clusters") ?? [];
     const clusters = new Map<string, ClusterModel>();
 
diff --git a/src/migrations/cluster-store/snap.ts b/src/migrations/cluster-store/snap.ts
index 9128dca82a..eb02cac81c 100644
--- a/src/migrations/cluster-store/snap.ts
+++ b/src/migrations/cluster-store/snap.ts
@@ -6,13 +6,14 @@
 // Fix embedded kubeconfig paths under snap config
 
 import type { ClusterModel } from "../../common/cluster-types";
-import { getAppVersion } from "../../common/utils/app-version";
 import fs from "fs";
 import type { MigrationDeclaration } from "../helpers";
 import { migrationLog } from "../helpers";
+import packageJson from "../../../package.json";
 
 export default {
-  version: getAppVersion(), // Run always after upgrade
+  // TODO: replace with injection once migrations are made as injectables
+  version: packageJson.version, // Run always after upgrade
   run(store) {
     if (!process.env["SNAP"]) return;
 
diff --git a/src/migrations/hotbar-store/5.0.0-beta.10.ts b/src/migrations/hotbar-store/5.0.0-beta.10.ts
index 95a4c616d4..771a37fa36 100644
--- a/src/migrations/hotbar-store/5.0.0-beta.10.ts
+++ b/src/migrations/hotbar-store/5.0.0-beta.10.ts
@@ -5,7 +5,6 @@
 
 import fse from "fs-extra";
 import { isNull } from "lodash";
-import path from "path";
 import * as uuid from "uuid";
 import type { ClusterStoreModel } from "../../common/cluster-store/cluster-store";
 import type { Hotbar, HotbarItem } from "../../common/hotbars/types";
@@ -17,6 +16,7 @@ import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-glo
 import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import catalogCatalogEntityInjectable from "../../common/catalog-entities/general-catalog-entities/implementations/catalog-catalog-entity.injectable";
 import { isDefined, isErrnoException } from "../../common/utils";
+import joinPathsInjectable from "../../common/path/join-paths.injectable";
 
 interface Pre500WorkspaceStoreModel {
   workspaces: {
@@ -40,6 +40,7 @@ export default {
     const di = getLegacyGlobalDiForExtensionApi();
 
     const userDataPath = di.inject(directoryForUserDataInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
 
     // Hotbars might be empty, if some of the previous migrations weren't run
     if (hotbars.length === 0) {
@@ -56,8 +57,8 @@ export default {
     }
 
     try {
-      const workspaceStoreData: Pre500WorkspaceStoreModel = fse.readJsonSync(path.join(userDataPath, "lens-workspace-store.json"));
-      const { clusters = [] }: ClusterStoreModel = fse.readJSONSync(path.join(userDataPath, "lens-cluster-store.json"));
+      const workspaceStoreData: Pre500WorkspaceStoreModel = fse.readJsonSync(joinPaths(userDataPath, "lens-workspace-store.json"));
+      const { clusters = [] }: ClusterStoreModel = fse.readJSONSync(joinPaths(userDataPath, "lens-cluster-store.json"));
       const workspaceHotbars = new Map<string, PartialHotbar>(); // mapping from WorkspaceId to HotBar
 
       for (const { id, name } of workspaceStoreData.workspaces) {
diff --git a/src/migrations/user-store/5.0.3-beta.1.ts b/src/migrations/user-store/5.0.3-beta.1.ts
index 40f93312cf..cf18ccd3e4 100644
--- a/src/migrations/user-store/5.0.3-beta.1.ts
+++ b/src/migrations/user-store/5.0.3-beta.1.ts
@@ -4,18 +4,18 @@
  */
 
 import { existsSync, readFileSync } from "fs";
-import path from "path";
 import os from "os";
 import type { ClusterStoreModel } from "../../common/cluster-store/cluster-store";
 import type { KubeconfigSyncEntry, UserPreferencesModel } from "../../common/user-store";
 import type { MigrationDeclaration } from "../helpers";
 import { migrationLog } from "../helpers";
-import { isErrnoException, isLogicalChildPath } from "../../common/utils";
+import { isErrnoException } from "../../common/utils";
 import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
-import directoryForUserDataInjectable
-  from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
-import directoryForKubeConfigsInjectable
-  from "../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
+import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForKubeConfigsInjectable from "../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
+import joinPathsInjectable from "../../common/path/join-paths.injectable";
+import isLogicalChildPathInjectable from "../../common/path/is-logical-child-path.injectable";
+import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable";
 
 export default {
   version: "5.0.3-beta.1",
@@ -27,18 +27,21 @@ export default {
 
       const userDataPath = di.inject(directoryForUserDataInjectable);
       const kubeConfigsPath = di.inject(directoryForKubeConfigsInjectable);
+      const joinPaths = di.inject(joinPathsInjectable);
+      const isLogicalChildPath = di.inject(isLogicalChildPathInjectable);
+      const getDirnameOfPath = di.inject(getDirnameOfPathInjectable);
 
-      const { clusters = [] }: ClusterStoreModel = JSON.parse(readFileSync(path.resolve(userDataPath, "lens-cluster-store.json"), "utf-8")) ?? {};
-      const extensionDataDir = path.resolve(userDataPath, "extension_data");
+      const { clusters = [] }: ClusterStoreModel = JSON.parse(readFileSync(joinPaths(userDataPath, "lens-cluster-store.json"), "utf-8")) ?? {};
+      const extensionDataDir = joinPaths(userDataPath, "extension_data");
       const syncPaths = new Set(syncKubeconfigEntries.map(s => s.filePath));
 
-      syncPaths.add(path.join(os.homedir(), ".kube"));
+      syncPaths.add(joinPaths(os.homedir(), ".kube"));
 
       for (const cluster of clusters) {
         if (!cluster.kubeConfigPath) {
           continue;
         }
-        const dirOfKubeconfig = path.dirname(cluster.kubeConfigPath);
+        const dirOfKubeconfig = getDirnameOfPath(cluster.kubeConfigPath);
 
         if (dirOfKubeconfig === kubeConfigsPath) {
           migrationLog(`Skipping ${cluster.id} because kubeConfigPath is under the stored KubeConfig folder`);
diff --git a/src/migrations/weblinks-store/currentVersion.ts b/src/migrations/weblinks-store/currentVersion.ts
index 6a319bc286..afa404847b 100644
--- a/src/migrations/weblinks-store/currentVersion.ts
+++ b/src/migrations/weblinks-store/currentVersion.ts
@@ -3,13 +3,14 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { getAppVersion } from "../../common/utils";
-import { lensSlackWeblinkId, slackUrl } from "../../common/vars";
+import { docsUrl, lensDocumentationWeblinkId, lensSlackWeblinkId, slackUrl } from "../../common/vars";
 import type { WeblinkData } from "../../common/weblink-store";
 import type { MigrationDeclaration } from "../helpers";
+import packageJson from "../../../package.json";
 
 export default {
-  version: getAppVersion(), // Run always after upgrade
+  // TODO: replace with injection once migrations are made as injectables
+  version: packageJson.version, // Run always after upgrade
   run(store) {
     const weblinksRaw: any = store.get("weblinks");
     const weblinks = (Array.isArray(weblinksRaw) ? weblinksRaw : []) as WeblinkData[];
@@ -19,6 +20,12 @@ export default {
       slackWeblink.url = slackUrl;
     }
 
+    const docsWeblink = weblinks.find(weblink => weblink.id === lensDocumentationWeblinkId);
+
+    if (docsWeblink) {
+      docsWeblink.url = docsUrl;
+    }
+
     store.set("weblinks", weblinks);
   },
 } as MigrationDeclaration;
diff --git a/src/renderer/api/on-api-error.ts b/src/renderer/api/on-api-error.ts
deleted file mode 100644
index c3cb2bb7f7..0000000000
--- a/src/renderer/api/on-api-error.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { Response } from "node-fetch";
-import type { JsonApiErrorParsed } from "../../common/k8s-api/json-api";
-import { Notifications } from "../components/notifications";
-
-export function onApiError(error: JsonApiErrorParsed, res: Response) {
-  switch (res.status) {
-    case 403:
-      error.isUsedForNotification = true;
-      Notifications.error(error);
-      break;
-  }
-}
diff --git a/src/renderer/api/setup-on-api-errors.injectable.ts b/src/renderer/api/setup-on-api-errors.injectable.ts
deleted file mode 100644
index 859b333586..0000000000
--- a/src/renderer/api/setup-on-api-errors.injectable.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { apiBase } from "../../common/k8s-api";
-import { onApiError } from "./on-api-error";
-import { beforeFrameStartsInjectionToken } from "../before-frame-starts/before-frame-starts-injection-token";
-
-const setupOnApiErrorListenersInjectable = getInjectable({
-  id: "setup-on-api-error-listeners",
-
-  instantiate: () => ({
-    run: () => {
-      apiBase?.onError.addListener(onApiError);
-    },
-  }),
-
-  injectionToken: beforeFrameStartsInjectionToken,
-  causesSideEffects: true,
-});
-
-export default setupOnApiErrorListenersInjectable;
diff --git a/src/renderer/app-paths/setup-app-paths.injectable.ts b/src/renderer/app-paths/setup-app-paths.injectable.ts
index 14242347f4..50ad4df34a 100644
--- a/src/renderer/app-paths/setup-app-paths.injectable.ts
+++ b/src/renderer/app-paths/setup-app-paths.injectable.ts
@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import appPathsStateInjectable from "../../common/app-paths/app-paths-state.injectable";
 import { beforeFrameStartsInjectionToken } from "../before-frame-starts/before-frame-starts-injection-token";
-import appPathsChannelInjectable from "../../common/app-paths/app-paths-channel.injectable";
+import { appPathsChannel } from "../../common/app-paths/app-paths-channel";
 import { requestFromChannelInjectionToken } from "../../common/utils/channel/request-from-channel-injection-token";
 
 const setupAppPathsInjectable = getInjectable({
@@ -13,14 +13,12 @@ const setupAppPathsInjectable = getInjectable({
 
   instantiate: (di) => {
     const requestFromChannel = di.inject(requestFromChannelInjectionToken);
-    const appPathsChannel = di.inject(appPathsChannelInjectable);
     const appPathsState = di.inject(appPathsStateInjectable);
 
     return {
+      id: "setup-app-paths",
       run: async () => {
-        const appPaths = await requestFromChannel(
-          appPathsChannel,
-        );
+        const appPaths = await requestFromChannel(appPathsChannel);
 
         appPathsState.set(appPaths);
       },
diff --git a/src/renderer/bootstrap.tsx b/src/renderer/bootstrap.tsx
index 5573dbdbd2..53e2913583 100644
--- a/src/renderer/bootstrap.tsx
+++ b/src/renderer/bootstrap.tsx
@@ -20,7 +20,6 @@ import configurePackages from "../common/configure-packages";
 import * as initializers from "./initializers";
 import logger from "../common/logger";
 import { WeblinkStore } from "../common/weblink-store";
-import { initializeSentryReporting } from "../common/sentry";
 import { registerCustomThemes } from "./components/monaco-editor";
 import { getDi } from "./getDi";
 import { DiContextProvider } from "@ogre-tools/injectable-react";
@@ -29,7 +28,6 @@ import extensionLoaderInjectable from "../extensions/extension-loader/extension-
 import extensionDiscoveryInjectable from "../extensions/extension-discovery/extension-discovery.injectable";
 import extensionInstallationStateStoreInjectable from "../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
 import clusterStoreInjectable from "../common/cluster-store/cluster-store.injectable";
-import userStoreInjectable from "../common/user-store/user-store.injectable";
 import initRootFrameInjectable from "./frames/root-frame/init-root-frame/init-root-frame.injectable";
 import initClusterFrameInjectable from "./frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable";
 import commandOverlayInjectable from "./components/command-palette/command-overlay.injectable";
@@ -46,6 +44,7 @@ import kubernetesClusterCategoryInjectable from "../common/catalog/categories/ku
 import autoRegistrationInjectable from "../common/k8s-api/api-manager/auto-registration.injectable";
 import assert from "assert";
 import startFrameInjectable from "./start-frame/start-frame.injectable";
+import initializeSentryReportingWithInjectable from "../common/error-reporting/initialize-sentry-reporting.injectable";
 
 configurePackages(); // global packages
 registerCustomThemes(); // monaco editor themes
@@ -62,8 +61,10 @@ async function attachChromeDebugger() {
 }
 
 export async function bootstrap(di: DiContainer) {
+  const initializeSentryReportingWith = di.inject(initializeSentryReportingWithInjectable);
+
   if (process.isMainFrame) {
-    initializeSentryReporting(init);
+    initializeSentryReportingWith(init);
   }
 
   const startFrame = di.inject(startFrameInjectable);
@@ -90,9 +91,6 @@ export async function bootstrap(di: DiContainer) {
    */
   di.inject(autoRegistrationInjectable);
 
-  // TODO: Remove temporal dependencies to make timing of initialization not important
-  di.inject(userStoreInjectable);
-
   await attachChromeDebugger();
   rootElem.classList.toggle("is-mac", isMac);
 
diff --git a/src/renderer/components/+add-cluster/add-cluster.tsx b/src/renderer/components/+add-cluster/add-cluster.tsx
index 6630420ad6..5af1e13b48 100644
--- a/src/renderer/components/+add-cluster/add-cluster.tsx
+++ b/src/renderer/components/+add-cluster/add-cluster.tsx
@@ -10,10 +10,8 @@ import fse from "fs-extra";
 import { debounce } from "lodash";
 import { action, computed, makeObservable, observable } from "mobx";
 import { observer } from "mobx-react";
-import path from "path";
 import React from "react";
 import * as uuid from "uuid";
-import { appEventBus } from "../../../common/app-event-bus/event-bus";
 import { loadConfigFromString, splitConfig } from "../../../common/kube-helpers";
 import { docsUrl } from "../../../common/vars";
 import { isDefined, iter } from "../../utils";
@@ -25,6 +23,10 @@ import { withInjectables } from "@ogre-tools/injectable-react";
 import getCustomKubeConfigDirectoryInjectable from "../../../common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable";
 import type { NavigateToCatalog } from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
 import navigateToCatalogInjectable from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
+import type { EmitAppEvent } from "../../../common/app-event-bus/emit-event.injectable";
+import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
+import type { GetDirnameOfPath } from "../../../common/path/get-dirname.injectable";
+import getDirnameOfPathInjectable from "../../../common/path/get-dirname.injectable";
 
 interface Option {
   config: KubeConfig;
@@ -34,6 +36,8 @@ interface Option {
 interface Dependencies {
   getCustomKubeConfigDirectory: (directoryName: string) => string;
   navigateToCatalog: NavigateToCatalog;
+  getDirnameOfPath: GetDirnameOfPath;
+  emitAppEvent: EmitAppEvent;
 }
 
 function getContexts(config: KubeConfig): Map<string, Option> {
@@ -53,13 +57,13 @@ class NonInjectedAddCluster extends React.Component<Dependencies> {
   @observable isWaiting = false;
   @observable errors: string[] = [];
 
-  constructor(dependencies: Dependencies) {
-    super(dependencies);
+  constructor(props: Dependencies) {
+    super(props);
     makeObservable(this);
   }
 
   componentDidMount() {
-    appEventBus.emit({ name: "cluster-add", action: "start" });
+    this.props.emitAppEvent({ name: "cluster-add", action: "start" });
   }
 
   @computed get allErrors(): string[] {
@@ -85,12 +89,12 @@ class NonInjectedAddCluster extends React.Component<Dependencies> {
 
   addClusters = action(async () => {
     this.isWaiting = true;
-    appEventBus.emit({ name: "cluster-add", action: "click" });
+    this.props.emitAppEvent({ name: "cluster-add", action: "click" });
 
     try {
       const absPath = this.props.getCustomKubeConfigDirectory(uuid.v4());
 
-      await fse.ensureDir(path.dirname(absPath));
+      await fse.ensureDir(this.props.getDirnameOfPath(absPath));
       await fse.writeFile(absPath, this.customConfig.trim(), { encoding: "utf-8", mode: 0o600 });
 
       Notifications.ok(`Successfully added ${this.kubeContexts.size} new cluster(s)`);
@@ -112,7 +116,7 @@ class NonInjectedAddCluster extends React.Component<Dependencies> {
           <code>~/.kube/config</code>
           {" file. "}
           <a
-            href={`${docsUrl}/catalog/add-cluster/`}
+            href={`${docsUrl}/getting-started/add-cluster/`}
             rel="noreferrer"
             target="_blank"
           >
@@ -155,10 +159,9 @@ class NonInjectedAddCluster extends React.Component<Dependencies> {
 
 export const AddCluster = withInjectables<Dependencies>(NonInjectedAddCluster, {
   getProps: (di) => ({
-    getCustomKubeConfigDirectory: di.inject(
-      getCustomKubeConfigDirectoryInjectable,
-    ),
-
+    getCustomKubeConfigDirectory: di.inject(getCustomKubeConfigDirectoryInjectable),
     navigateToCatalog: di.inject(navigateToCatalogInjectable),
+    getDirnameOfPath: di.inject(getDirnameOfPathInjectable),
+    emitAppEvent: di.inject(emitAppEventInjectable),
   }),
 });
diff --git a/src/renderer/components/+catalog/__tests__/catalog-add-button.test.tsx b/src/renderer/components/+catalog/__tests__/catalog-add-button.test.tsx
index 1f1fa1bfab..499f482f36 100644
--- a/src/renderer/components/+catalog/__tests__/catalog-add-button.test.tsx
+++ b/src/renderer/components/+catalog/__tests__/catalog-add-button.test.tsx
@@ -3,11 +3,13 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import React from "react";
-import { render, screen } from "@testing-library/react";
+import { screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import type { CatalogCategorySpec } from "../../../../common/catalog";
 import { CatalogCategory } from "../../../../common/catalog";
 import { CatalogAddButton } from "../catalog-add-button";
+import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
+import { type DiRender, renderFor } from "../../test-utils/renderFor";
 
 class TestCatalogCategory extends CatalogCategory {
   public readonly apiVersion = "catalog.k8slens.dev/v1alpha1";
@@ -26,6 +28,14 @@ class TestCatalogCategory extends CatalogCategory {
 }
 
 describe("CatalogAddButton", () => {
+  let render: DiRender;
+
+  beforeEach(() => {
+    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    render = renderFor(di);
+  });
+
   it("opens Add menu", async () => {
     const category = new TestCatalogCategory();
 
diff --git a/src/renderer/components/+catalog/__tests__/custom-columns.test.ts b/src/renderer/components/+catalog/__tests__/custom-columns.test.ts
index d689e8f812..c79162b55e 100644
--- a/src/renderer/components/+catalog/__tests__/custom-columns.test.ts
+++ b/src/renderer/components/+catalog/__tests__/custom-columns.test.ts
@@ -4,16 +4,15 @@
  */
 
 import type { DiContainer } from "@ogre-tools/injectable";
-import { computed } from "mobx";
 import type { CatalogCategorySpec } from "../../../../common/catalog";
-import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension";
-import rendererExtensionsInjectable from "../../../../extensions/renderer-extensions.injectable";
+import { LensRendererExtension } from "../../../../extensions/lens-renderer-extension";
 import { CatalogCategory } from "../../../api/catalog-entity";
 import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
 import type { AdditionalCategoryColumnRegistration, CategoryColumnRegistration } from "../custom-category-columns";
 import type { CategoryColumns, GetCategoryColumnsParams } from "../columns/get.injectable";
 import getCategoryColumnsInjectable from "../columns/get.injectable";
 import hotbarStoreInjectable from "../../../../common/hotbars/store.injectable";
+import extensionInjectable from "../../../../extensions/extension-loader/extension/extension.injectable";
 
 class TestCategory extends CatalogCategory {
   apiVersion = "catalog.k8slens.dev/v1alpha1";
@@ -41,21 +40,16 @@ class TestCategory extends CatalogCategory {
 
 describe("Custom Category Columns", () => {
   let di: DiContainer;
+  let getCategoryColumns: (params: GetCategoryColumnsParams) => CategoryColumns;
 
   beforeEach(() => {
     di = getDiForUnitTesting({ doGeneralOverrides: true });
 
     di.override(hotbarStoreInjectable, () => ({}));
+    getCategoryColumns = di.inject(getCategoryColumnsInjectable);
   });
 
   describe("without extensions", () => {
-    let getCategoryColumns: (params: GetCategoryColumnsParams) => CategoryColumns;
-
-    beforeEach(() => {
-      di.override(rendererExtensionsInjectable, () => computed(() => [] as LensRendererExtension[]));
-      getCategoryColumns = di.inject(getCategoryColumnsInjectable);
-    });
-
     it("should contain a kind column if activeCategory is falsy", () => {
       expect(getCategoryColumns({ activeCategory: null }).renderTableHeader.find(elem => elem?.title === "Kind")).toBeTruthy();
     });
@@ -88,13 +82,9 @@ describe("Custom Category Columns", () => {
   });
 
   describe("with extensions", () => {
-    let getCategoryColumns: (params: GetCategoryColumnsParams) => CategoryColumns;
-
     beforeEach(() => {
-      di.override(rendererExtensionsInjectable, () => computed(() => [
-        {
-          name: "test-extension",
-          additionalCategoryColumns: [
+      const ext = di.inject(extensionInjectable, new (class extends LensRendererExtension {
+        additionalCategoryColumns = [
             {
               group: "foo.bar.bat",
               id: "high",
@@ -113,10 +103,24 @@ describe("Custom Category Columns", () => {
                 title: "High2",
               },
             } as AdditionalCategoryColumnRegistration,
-          ],
-        } as LensRendererExtension,
-      ]));
-      getCategoryColumns = di.inject(getCategoryColumnsInjectable);
+        ];
+      })({
+        absolutePath: "/some-absolute-path",
+        id: "some-id",
+        isBundled: false,
+        isCompatible: true,
+        isEnabled: true,
+        manifest: {
+          engines: {
+            lens: "",
+          },
+          name: "some-extension-name",
+          version: "1.0.0",
+        },
+        manifestPath: "/some-manifest-path",
+      }));
+
+      ext.register();
     });
 
     it("should include columns from extensions that match", () => {
diff --git a/src/renderer/components/+catalog/catalog-menu.tsx b/src/renderer/components/+catalog/catalog-menu.tsx
index 8a672ddb44..5947f0a301 100644
--- a/src/renderer/components/+catalog/catalog-menu.tsx
+++ b/src/renderer/components/+catalog/catalog-menu.tsx
@@ -9,23 +9,21 @@ import styles from "./catalog-menu.module.scss";
 import React from "react";
 import type { TreeItemProps } from "@material-ui/lab";
 import { TreeItem, TreeView } from "@material-ui/lab";
-import { catalogCategoryRegistry } from "../../api/catalog-category-registry";
 import { Icon } from "../icon";
 import { StylesProvider } from "@material-ui/core";
 import { cssNames } from "../../utils";
 import type { CatalogCategory } from "../../api/catalog-entity";
 import { observer } from "mobx-react";
 import { CatalogCategoryLabel } from "./catalog-category-label";
+import type { IComputedValue } from "mobx";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import filteredCategoriesInjectable from "../../../common/catalog/filtered-categories.injectable";
 
 export interface CatalogMenuProps {
   activeTab: string | undefined;
   onItemClick: (id: string) => void;
 }
 
-function getCategories() {
-  return catalogCategoryRegistry.filteredItems;
-}
-
 function getCategoryIcon(category: CatalogCategory) {
   const { icon } = category.metadata ?? {};
 
@@ -44,44 +42,56 @@ function Item(props: TreeItemProps) {
   );
 }
 
-export const CatalogMenu = observer((props: CatalogMenuProps) => {
-  return (
-    // Overwrite Material UI styles with injectFirst https://material-ui.com/guides/interoperability/#controlling-priority-4
-    <StylesProvider injectFirst>
-      <div className="flex flex-col w-full">
-        <div className={styles.catalog}>Catalog</div>
-        <TreeView
-          defaultExpanded={["catalog"]}
-          defaultCollapseIcon={<Icon material="expand_more"/>}
-          defaultExpandIcon={<Icon material="chevron_right" />}
-          selected={props.activeTab || "browse"}
+interface Dependencies {
+  filteredCategories: IComputedValue<CatalogCategory[]>;
+}
+
+const NonInjectedCatalogMenu = observer(({
+  activeTab,
+  filteredCategories,
+  onItemClick,
+}: CatalogMenuProps & Dependencies) => (
+  // Overwrite Material UI styles with injectFirst https://material-ui.com/guides/interoperability/#controlling-priority-4
+  <StylesProvider injectFirst>
+    <div className="flex flex-col w-full">
+      <div className={styles.catalog}>Catalog</div>
+      <TreeView
+        defaultExpanded={["catalog"]}
+        defaultCollapseIcon={<Icon material="expand_more" />}
+        defaultExpandIcon={<Icon material="chevron_right" />}
+        selected={activeTab || "browse"}
+      >
+        <Item
+          nodeId="browse"
+          label="Browse"
+          data-testid="*-tab"
+          onClick={() => onItemClick("*")} />
+        <Item
+          nodeId="catalog"
+          label={<div className={styles.parent}>Categories</div>}
+          className={cssNames(styles.bordered)}
         >
-          <Item
-            nodeId="browse"
-            label="Browse"
-            data-testid="*-tab"
-            onClick={() => props.onItemClick("*")}
-          />
-          <Item
-            nodeId="catalog"
-            label={<div className={styles.parent}>Categories</div>}
-            className={cssNames(styles.bordered)}
-          >
-            {
-              getCategories().map(category => (
+          {
+            filteredCategories.get()
+              .map(category => (
                 <Item
                   icon={getCategoryIcon(category)}
                   key={category.getId()}
                   nodeId={category.getId()}
-                  label={<CatalogCategoryLabel category={category}/>}
+                  label={<CatalogCategoryLabel category={category} />}
                   data-testid={`${category.getId()}-tab`}
-                  onClick={() => props.onItemClick(category.getId())}
-                />
+                  onClick={() => onItemClick(category.getId())} />
               ))
-            }
-          </Item>
-        </TreeView>
-      </div>
-    </StylesProvider>
-  );
+          }
+        </Item>
+      </TreeView>
+    </div>
+  </StylesProvider>
+));
+
+export const CatalogMenu = withInjectables<Dependencies, CatalogMenuProps>(NonInjectedCatalogMenu, {
+  getProps: (di, props) => ({
+    ...props,
+    filteredCategories: di.inject(filteredCategoriesInjectable),
+  }),
 });
diff --git a/src/renderer/components/+catalog/catalog.test.tsx b/src/renderer/components/+catalog/catalog.test.tsx
index 885fa640d5..6eb6c1ad57 100644
--- a/src/renderer/components/+catalog/catalog.test.tsx
+++ b/src/renderer/components/+catalog/catalog.test.tsx
@@ -57,7 +57,7 @@ describe("<Catalog />", () => {
   let di: DiContainer;
   let catalogEntityStore: CatalogEntityStore;
   let catalogEntityRegistry: CatalogEntityRegistry;
-  let emitEvent: (event: AppEvent) => void;
+  let appEventListener: jest.MockedFunction<(event: AppEvent) => void>;
   let onRun: jest.MockedFunction<(context: CatalogEntityActionContext) => void | Promise<void>>;
   let catalogEntityItem: MockCatalogEntity;
   let render: DiRender;
@@ -78,11 +78,8 @@ describe("<Catalog />", () => {
     catalogEntityItem = createMockCatalogEntity(onRun);
     catalogEntityRegistry = di.inject(catalogEntityRegistryInjectable);
 
-    emitEvent = jest.fn();
-
-    di.override(appEventBusInjectable, () => ({
-      emit: emitEvent,
-    }));
+    appEventListener = jest.fn();
+    di.inject(appEventBusInjectable).addListener(appEventListener);
 
     catalogEntityStore = di.inject(catalogEntityStoreInjectable);
     Object.assign(catalogEntityStore, {
@@ -204,24 +201,20 @@ describe("<Catalog />", () => {
   });
 
   it("emits catalog open AppEvent", () => {
-    render(
-      <Catalog />,
-    );
+    render(<Catalog />);
 
-    expect(emitEvent).toHaveBeenCalledWith( {
+    expect(appEventListener).toHaveBeenCalledWith( {
       action: "open",
       name: "catalog",
     });
   });
 
   it("emits catalog change AppEvent when changing the category", () => {
-    render(
-      <Catalog />,
-    );
+    render(<Catalog />);
 
     userEvent.click(screen.getByText("Web Links"));
 
-    expect(emitEvent).toHaveBeenLastCalledWith({
+    expect(appEventListener).toHaveBeenCalledWith({
       action: "change-category",
       name: "catalog",
       params: {
diff --git a/src/renderer/components/+catalog/catalog.tsx b/src/renderer/components/+catalog/catalog.tsx
index 723c21da13..2dc7a589fb 100644
--- a/src/renderer/components/+catalog/catalog.tsx
+++ b/src/renderer/components/+catalog/catalog.tsx
@@ -37,8 +37,6 @@ import type { NavigateToCatalog } from "../../../common/front-end-routing/routes
 import navigateToCatalogInjectable from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
 import catalogRouteParametersInjectable from "./catalog-route-parameters.injectable";
 import { browseCatalogTab } from "./catalog-browse-tab";
-import type { AppEvent } from "../../../common/app-event-bus/event-bus";
-import appEventBusInjectable from "../../../common/app-event-bus/app-event-bus.injectable";
 import hotbarStoreInjectable from "../../../common/hotbars/store.injectable";
 import type { HotbarStore } from "../../../common/hotbars/store";
 import type { VisitEntityContextMenu } from "../../../common/catalog/visit-entity-context-menu.injectable";
@@ -48,13 +46,15 @@ import type { Navigate } from "../../navigation/navigate.injectable";
 import navigateInjectable from "../../navigation/navigate.injectable";
 import type { NormalizeCatalogEntityContextMenu } from "../../catalog/normalize-menu-item.injectable";
 import normalizeCatalogEntityContextMenuInjectable from "../../catalog/normalize-menu-item.injectable";
+import type { EmitAppEvent } from "../../../common/app-event-bus/emit-event.injectable";
+import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
 
 interface Dependencies {
   catalogPreviousActiveTabStorage: StorageLayer<string | null>;
   catalogEntityStore: CatalogEntityStore;
   getCategoryColumns: (params: GetCategoryColumnsParams) => CategoryColumns;
   customCategoryViews: IComputedValue<Map<string, Map<string, RegisteredCustomCategoryViewDecl>>>;
-  emitEvent: (event: AppEvent) => void;
+  emitEvent: EmitAppEvent;
   routeParameters: {
     group: IComputedValue<string>;
     kind: IComputedValue<string>;
@@ -356,7 +356,7 @@ export const Catalog = withInjectables<Dependencies>(NonInjectedCatalog, {
     customCategoryViews: di.inject(customCategoryViewsInjectable),
     routeParameters: di.inject(catalogRouteParametersInjectable),
     navigateToCatalog: di.inject(navigateToCatalogInjectable),
-    emitEvent: di.inject(appEventBusInjectable).emit,
+    emitEvent: di.inject(emitAppEventInjectable),
     hotbarStore: di.inject(hotbarStoreInjectable),
     catalogCategoryRegistry: di.inject(catalogCategoryRegistryInjectable),
     visitEntityContextMenu: di.inject(visitEntityContextMenuInjectable),
diff --git a/src/renderer/components/+catalog/columns/custom-token.ts b/src/renderer/components/+catalog/columns/custom-token.ts
new file mode 100644
index 0000000000..140f407e9e
--- /dev/null
+++ b/src/renderer/components/+catalog/columns/custom-token.ts
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectionToken } from "@ogre-tools/injectable";
+import type { RegisteredAdditionalCategoryColumn } from "../custom-category-columns";
+
+export interface CustomCatalogCategoryRegistration {
+  kind: string;
+  group: string;
+  registration: RegisteredAdditionalCategoryColumn;
+}
+
+export const customCatalogCategoryColumnInjectionToken = getInjectionToken<CustomCatalogCategoryRegistration>({
+  id: "custom-catalog-category-column-token",
+});
diff --git a/src/renderer/components/+catalog/columns/extensions-registrator.injectable.ts b/src/renderer/components/+catalog/columns/extensions-registrator.injectable.ts
new file mode 100644
index 0000000000..c4223da3ea
--- /dev/null
+++ b/src/renderer/components/+catalog/columns/extensions-registrator.injectable.ts
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { ExtensionRegistrator } from "../../../../extensions/extension-loader/extension-registrator-injection-token";
+import { extensionRegistratorInjectionToken } from "../../../../extensions/extension-loader/extension-registrator-injection-token";
+import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension";
+import type { AdditionalCategoryColumnRegistration } from "../custom-category-columns";
+import { customCatalogCategoryColumnInjectionToken } from "./custom-token";
+
+const customCategoryColumnsRegistratorInjectable = getInjectable({
+  id: "custom-category-columns-registrator",
+  instantiate: (): ExtensionRegistrator => {
+    return (ext) => {
+      const extension = ext as LensRendererExtension;
+
+      return extension.additionalCategoryColumns.map(getInjectableForColumnRegistrationFor(extension));
+    };
+  },
+  injectionToken: extensionRegistratorInjectionToken,
+});
+
+export default customCategoryColumnsRegistratorInjectable;
+
+const getInjectableForColumnRegistrationFor = (extension: LensRendererExtension) => ({
+  group,
+  id,
+  kind,
+  renderCell,
+  titleProps,
+  priority = 50,
+  searchFilter,
+  sortCallback,
+}: AdditionalCategoryColumnRegistration) => {
+  return getInjectable({
+    id: `${extension.manifest.name}:${group}/${kind}:${id}`,
+    instantiate: () => ({
+      group,
+      kind,
+      registration: {
+        renderCell,
+        priority,
+        id,
+        titleProps: {
+          id,
+          ...titleProps,
+          sortBy: sortCallback
+            ? id
+            : undefined,
+        },
+        searchFilter,
+        sortCallback,
+      },
+    }),
+    injectionToken: customCatalogCategoryColumnInjectionToken,
+  });
+};
diff --git a/src/renderer/components/+catalog/columns/get.injectable.ts b/src/renderer/components/+catalog/columns/get.injectable.ts
index 03930578c1..91a92473fd 100644
--- a/src/renderer/components/+catalog/columns/get.injectable.ts
+++ b/src/renderer/components/+catalog/columns/get.injectable.ts
@@ -47,7 +47,10 @@ const getCategoryColumnsInjectable = getInjectable({
         }
 
         tableRowRenderers.push(registration.renderCell);
-        renderTableHeader.push(registration.titleProps);
+        renderTableHeader.push({
+          id: registration.id,
+          ...registration.titleProps,
+        });
       }
 
       return {
diff --git a/src/renderer/components/+catalog/columns/kubernetes-api-version.injectable.tsx b/src/renderer/components/+catalog/columns/kubernetes-api-version.injectable.tsx
new file mode 100644
index 0000000000..13e8127687
--- /dev/null
+++ b/src/renderer/components/+catalog/columns/kubernetes-api-version.injectable.tsx
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import React from "react";
+import type { KubernetesCluster } from "../../../../common/catalog-entities";
+import { customCatalogCategoryColumnInjectionToken } from "./custom-token";
+
+const kubernetesApiVersionColumnInjectable = getInjectable({
+  id: "kubernetes-api-version-column",
+  instantiate: () => ({
+    group: "entity.k8slens.dev",
+    kind: "KubernetesCluster",
+    registration: {
+      id: "version",
+      priority: 30,
+      renderCell: entity => {
+        const k8sVersion = (entity as KubernetesCluster).metadata.kubeVersion;
+
+        return (
+          <span key="version">
+            {k8sVersion === "unknown" ? "" : k8sVersion}
+          </span>
+        );
+      },
+      titleProps: {
+        title: "Version",
+      },
+    },
+  }),
+  injectionToken: customCatalogCategoryColumnInjectionToken,
+});
+
+export default kubernetesApiVersionColumnInjectable;
diff --git a/src/renderer/components/+catalog/columns/kubernetes-distribution.injectable.tsx b/src/renderer/components/+catalog/columns/kubernetes-distribution.injectable.tsx
new file mode 100644
index 0000000000..617d55b11d
--- /dev/null
+++ b/src/renderer/components/+catalog/columns/kubernetes-distribution.injectable.tsx
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import React from "react";
+import type { KubernetesCluster } from "../../../../common/catalog-entities";
+import { customCatalogCategoryColumnInjectionToken } from "./custom-token";
+
+const kubernetesDistributionColumnInjectable = getInjectable({
+  id: "kubernetes-distribution-column",
+  instantiate: () => ({
+    group: "entity.k8slens.dev",
+    kind: "KubernetesCluster",
+    registration: {
+      id: "distro",
+      priority: 30,
+      renderCell: entity => {
+        const k8sDistro = (entity as KubernetesCluster).metadata.distro;
+
+        return (
+          <span key="distro">
+            {k8sDistro === "unknown" ? "" : k8sDistro}
+          </span>
+        );
+      },
+      titleProps: {
+        title: "Distro",
+      },
+    },
+  }),
+  injectionToken: customCatalogCategoryColumnInjectionToken,
+});
+
+export default kubernetesDistributionColumnInjectable;
+
diff --git a/src/renderer/components/+catalog/custom-category-columns.injectable.tsx b/src/renderer/components/+catalog/custom-category-columns.injectable.tsx
index edfbe31f6d..1c0d13964d 100644
--- a/src/renderer/components/+catalog/custom-category-columns.injectable.tsx
+++ b/src/renderer/components/+catalog/custom-category-columns.injectable.tsx
@@ -3,54 +3,31 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type { IComputedValue } from "mobx";
+import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
 import { computed } from "mobx";
-import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension";
-import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable";
 import { getOrInsert, getOrInsertMap } from "../../utils";
+import { customCatalogCategoryColumnInjectionToken } from "./columns/custom-token";
 import type { RegisteredAdditionalCategoryColumn } from "./custom-category-columns";
 
-interface Dependencies {
-  extensions: IComputedValue<LensRendererExtension[]>;
-}
-
-function getAdditionCategoryColumns({ extensions }: Dependencies): IComputedValue<Map<string, Map<string, RegisteredAdditionalCategoryColumn[]>>> {
-  return computed(() => {
-    const res = new Map<string, Map<string, RegisteredAdditionalCategoryColumn[]>>();
-
-    for (const ext of extensions.get()) {
-      for (const { renderCell, titleProps, priority = 50, searchFilter, sortCallback, ...registration } of ext.additionalCategoryColumns) {
-        const byGroup = getOrInsertMap(res, registration.group);
-        const byKind = getOrInsert(byGroup, registration.kind, []);
-        const id = `${ext.name}:${registration.id}`;
-
-        byKind.push({
-          renderCell,
-          priority,
-          id,
-          titleProps: {
-            id,
-            ...titleProps,
-            sortBy: sortCallback
-              ? id
-              : undefined,
-          },
-          searchFilter,
-          sortCallback,
-        });
-      }
-    }
-
-    return res;
-  });
-}
-
 const categoryColumnsInjectable = getInjectable({
   id: "category-columns",
+  instantiate: (di) => {
+    const computedInjectMany = di.inject(computedInjectManyInjectable);
+    const columnRegistrations = computedInjectMany(customCatalogCategoryColumnInjectionToken);
 
-  instantiate: (di) => getAdditionCategoryColumns({
-    extensions: di.inject(rendererExtensionsInjectable),
-  }),
+    return computed(() => {
+      const res = new Map<string, Map<string, RegisteredAdditionalCategoryColumn[]>>();
+
+      for (const { group, kind, registration } of columnRegistrations.get()) {
+        const byGroup = getOrInsertMap(res, group);
+        const byKind = getOrInsert(byGroup, kind, []);
+
+        byKind.push(registration);
+      }
+
+      return res;
+    });
+  },
 });
 
 export default categoryColumnsInjectable;
diff --git a/src/renderer/components/+cluster/cluster-metric-switchers.tsx b/src/renderer/components/+cluster/cluster-metric-switchers.tsx
index 716084026d..7c072118dc 100644
--- a/src/renderer/components/+cluster/cluster-metric-switchers.tsx
+++ b/src/renderer/components/+cluster/cluster-metric-switchers.tsx
@@ -24,7 +24,7 @@ const NonInjectedClusterMetricSwitchers = observer(({
   nodeStore,
 }: Dependencies) => {
   const { masterNodes, workerNodes } = nodeStore;
-  const { cpuUsage, memoryUsage } = clusterOverviewStore.metrics;
+  const { cpuUsage, memoryUsage } = clusterOverviewStore.metrics ?? {};
   const hasMasterNodes = masterNodes.length > 0;
   const hasWorkerNodes = workerNodes.length > 0;
   const hasCpuMetrics = normalizeMetrics(cpuUsage).data.result[0].values.length > 0;
diff --git a/src/renderer/components/+cluster/cluster-metrics.tsx b/src/renderer/components/+cluster/cluster-metrics.tsx
index e744383a94..028885e7f3 100644
--- a/src/renderer/components/+cluster/cluster-metrics.tsx
+++ b/src/renderer/components/+cluster/cluster-metrics.tsx
@@ -26,8 +26,8 @@ interface Dependencies {
 
 const NonInjectedClusterMetrics = observer(({ clusterOverviewStore: { metricType, metricNodeRole, getMetricsValues, metricsLoaded, metrics }}: Dependencies) => {
   const [plugins] = useState([new ZebraStripesPlugin()]);
-  const { memoryCapacity, cpuCapacity } = getMetricLastPoints(metrics);
-  const metricValues = getMetricsValues(metrics);
+  const { memoryCapacity, cpuCapacity } = getMetricLastPoints(metrics ?? {});
+  const metricValues = getMetricsValues(metrics ?? {});
   const colors = { cpu: "#3D90CE", memory: "#C93DCE" };
   const data = metricValues.map(value => ({
     x: value[0],
diff --git a/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts b/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts
index b81cb5c3ac..6389009785 100644
--- a/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts
+++ b/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts
@@ -12,6 +12,7 @@ import clusterApiInjectable from "../../../../common/k8s-api/endpoints/cluster.a
 import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-created.injectable";
 import assert from "assert";
 import nodeStoreInjectable from "../../+nodes/store.injectable";
+import requestClusterMetricsByNodeNamesInjectable from "../../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable";
 
 const clusterOverviewStoreInjectable = getInjectable({
   id: "cluster-overview-store",
@@ -30,6 +31,7 @@ const clusterOverviewStoreInjectable = getInjectable({
         },
       ),
       nodeStore: di.inject(nodeStoreInjectable),
+      requestClusterMetricsByNodeNames: di.inject(requestClusterMetricsByNodeNamesInjectable),
     }, clusterApi);
   },
   injectionToken: kubeObjectStoreInjectionToken,
diff --git a/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.ts b/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.ts
index d3f47cb430..2669cb71a6 100644
--- a/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.ts
+++ b/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.ts
@@ -6,11 +6,12 @@
 import { action, observable, reaction, when, makeObservable } from "mobx";
 import { KubeObjectStore } from "../../../../common/k8s-api/kube-object.store";
 import type { Cluster, ClusterApi } from "../../../../common/k8s-api/endpoints";
-import { getMetricsByNodeNames, type ClusterMetricData } from "../../../../common/k8s-api/endpoints";
 import type { StorageLayer } from "../../../utils";
 import { autoBind } from "../../../utils";
-import { type IMetricsReqParams, normalizeMetrics } from "../../../../common/k8s-api/endpoints/metrics.api";
 import type { NodeStore } from "../../+nodes/store";
+import type { ClusterMetricData, RequestClusterMetricsByNodeNames } from "../../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable";
+import type { RequestMetricsParams } from "../../../../common/k8s-api/endpoints/metrics.api/request-metrics.injectable";
+import { normalizeMetrics } from "../../../../common/k8s-api/endpoints/metrics.api";
 
 export enum MetricType {
   MEMORY = "memory",
@@ -30,11 +31,15 @@ export interface ClusterOverviewStorageState {
 interface ClusterOverviewStoreDependencies {
   readonly storage: StorageLayer<ClusterOverviewStorageState>;
   readonly nodeStore: NodeStore;
+  requestClusterMetricsByNodeNames: RequestClusterMetricsByNodeNames;
 }
 
 export class ClusterOverviewStore extends KubeObjectStore<Cluster, ClusterApi> implements ClusterOverviewStorageState {
-  @observable metrics: Partial<ClusterMetricData> = {};
-  @observable metricsLoaded = false;
+  @observable metrics: ClusterMetricData | undefined = undefined;
+
+  get metricsLoaded() {
+    return !!this.metrics;
+  }
 
   get metricType(): MetricType {
     return this.dependencies.storage.get().metricType;
@@ -64,9 +69,10 @@ export class ClusterOverviewStore extends KubeObjectStore<Cluster, ClusterApi> i
     // TODO: refactor, seems not a correct place to be
     // auto-refresh metrics on user-action
     reaction(() => this.metricNodeRole, () => {
-      if (!this.metricsLoaded) return;
-      this.resetMetrics();
-      this.loadMetrics();
+      if (this.metrics) {
+        this.resetMetrics();
+        this.loadMetrics();
+      }
     });
 
     // check which node type to select
@@ -79,13 +85,12 @@ export class ClusterOverviewStore extends KubeObjectStore<Cluster, ClusterApi> i
   }
 
   @action
-  async loadMetrics(params?: IMetricsReqParams) {
+  async loadMetrics(params?: RequestMetricsParams) {
     await when(() => this.dependencies.nodeStore.isLoaded);
     const { masterNodes, workerNodes } = this.dependencies.nodeStore;
     const nodes = this.metricNodeRole === MetricNodeRole.MASTER && masterNodes.length ? masterNodes : workerNodes;
 
-    this.metrics = await getMetricsByNodeNames(nodes.map(node => node.getName()), params);
-    this.metricsLoaded = true;
+    this.metrics = await this.dependencies.requestClusterMetricsByNodeNames(nodes.map(node => node.getName()), params);
   }
 
   getMetricsValues(source: Partial<ClusterMetricData>): [number, string][] {
@@ -101,8 +106,7 @@ export class ClusterOverviewStore extends KubeObjectStore<Cluster, ClusterApi> i
 
   @action
   resetMetrics() {
-    this.metrics = {};
-    this.metricsLoaded = false;
+    this.metrics = undefined;
   }
 
   reset() {
diff --git a/src/renderer/components/+cluster/cluster-pie-charts.tsx b/src/renderer/components/+cluster/cluster-pie-charts.tsx
index 6d633c9eb9..fc18e26d18 100644
--- a/src/renderer/components/+cluster/cluster-pie-charts.tsx
+++ b/src/renderer/components/+cluster/cluster-pie-charts.tsx
@@ -23,6 +23,7 @@ import clusterOverviewStoreInjectable from "./cluster-overview-store/cluster-ove
 import nodeStoreInjectable from "../+nodes/store.injectable";
 import type { IComputedValue } from "mobx";
 import activeThemeInjectable from "../../themes/active.injectable";
+import type { ClusterMetricData } from "../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable";
 
 function createLabels(rawLabelData: [string, number | undefined][]): string[] {
   return rawLabelData.map(([key, value]) => `${key}: ${value?.toFixed(2) || "N/A"}`);
@@ -48,16 +49,32 @@ const NonInjectedClusterPieCharts = observer(({
     );
   };
 
-  const renderCharts = () => {
-    const data = getMetricLastPoints(clusterOverviewStore.metrics);
-    const { memoryUsage, memoryRequests, memoryAllocatableCapacity, memoryCapacity, memoryLimits } = data;
-    const { cpuUsage, cpuRequests, cpuAllocatableCapacity, cpuCapacity, cpuLimits } = data;
-    const { podUsage, podAllocatableCapacity, podCapacity } = data;
+  const renderCharts = (lastPoints: Partial<Record<keyof ClusterMetricData, number>>) => {
+    const {
+      memoryUsage, memoryRequests, memoryAllocatableCapacity, memoryCapacity, memoryLimits,
+      cpuUsage, cpuRequests, cpuAllocatableCapacity, cpuCapacity, cpuLimits,
+      podUsage, podAllocatableCapacity, podCapacity,
+    } = lastPoints;
+
+    if (
+      typeof cpuCapacity !== "number" ||
+      typeof cpuAllocatableCapacity !== "number" ||
+      typeof cpuLimits !== "number" ||
+      typeof podCapacity !== "number" ||
+      typeof podAllocatableCapacity !== "number" ||
+      typeof memoryAllocatableCapacity !== "number" ||
+      typeof memoryCapacity !== "number" ||
+      typeof memoryLimits !== "number" ||
+      typeof memoryUsage !== "number" ||
+      typeof memoryRequests !== "number"
+    ) {
+      return null;
+    }
+
     const cpuLimitsOverload = cpuLimits > cpuAllocatableCapacity;
     const memoryLimitsOverload = memoryLimits > memoryAllocatableCapacity;
     const defaultColor = activeTheme.get().colors.pieChartDefaultColor;
 
-    if (!memoryCapacity || !cpuCapacity || !podCapacity || !memoryAllocatableCapacity || !cpuAllocatableCapacity || !podAllocatableCapacity) return null;
     const cpuData: PieChartData = {
       datasets: [
         {
@@ -218,7 +235,7 @@ const NonInjectedClusterPieCharts = observer(({
     );
   };
 
-  const renderContent = ({ metricNodeRole, metricsLoaded }: ClusterOverviewStore) => {
+  const renderContent = ({ metricNodeRole, metrics }: ClusterOverviewStore) => {
     const { masterNodes, workerNodes } = nodeStore;
     const nodes = metricNodeRole === MetricNodeRole.MASTER ? masterNodes : workerNodes;
 
@@ -231,14 +248,16 @@ const NonInjectedClusterPieCharts = observer(({
       );
     }
 
-    if (!metricsLoaded) {
+    if (!metrics) {
       return (
         <div className={cssNames(styles.empty, "flex justify-center align-center box grow")}>
           <Spinner/>
         </div>
       );
     }
-    const { memoryCapacity, cpuCapacity, podCapacity } = getMetricLastPoints(clusterOverviewStore.metrics);
+
+    const lastPoints = getMetricLastPoints(metrics);
+    const { memoryCapacity, cpuCapacity, podCapacity } = lastPoints;
 
     if (!memoryCapacity || !cpuCapacity || !podCapacity) {
       return (
@@ -248,7 +267,7 @@ const NonInjectedClusterPieCharts = observer(({
       );
     }
 
-    return renderCharts();
+    return renderCharts(lastPoints);
   };
 
   return (
diff --git a/src/renderer/components/+config-leases/index.ts b/src/renderer/components/+config-leases/index.ts
new file mode 100644
index 0000000000..dcef127fb2
--- /dev/null
+++ b/src/renderer/components/+config-leases/index.ts
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+export * from "./leases";
+export * from "./lease-details";
diff --git a/src/common/logger-transports/index.ts b/src/renderer/components/+config-leases/lease-details.scss
similarity index 85%
rename from src/common/logger-transports/index.ts
rename to src/renderer/components/+config-leases/lease-details.scss
index 20205c616d..33628f74dd 100644
--- a/src/common/logger-transports/index.ts
+++ b/src/renderer/components/+config-leases/lease-details.scss
@@ -3,4 +3,4 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-export * from "./sentry";
+.LeaseDetails {}
\ No newline at end of file
diff --git a/src/renderer/components/+config-leases/lease-details.tsx b/src/renderer/components/+config-leases/lease-details.tsx
new file mode 100644
index 0000000000..617021edbf
--- /dev/null
+++ b/src/renderer/components/+config-leases/lease-details.tsx
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import "./lease-details.scss";
+
+import React from "react";
+import { observer } from "mobx-react";
+import { DrawerItem } from "../drawer";
+import type { KubeObjectDetailsProps } from "../kube-object-details";
+import { KubeObjectMeta } from "../kube-object-meta";
+import type { Lease } from "../../../common/k8s-api/endpoints";
+
+export interface LeaseDetailsProps extends KubeObjectDetailsProps<Lease> {
+}
+
+@observer
+export class LeaseDetails extends React.Component<LeaseDetailsProps> {
+
+  render() {
+    const { object: lease } = this.props;
+
+    return (
+      <div className="LeaseDetails">
+        <KubeObjectMeta object={lease} />
+
+        <DrawerItem name="Holder Identity">
+          {lease.getHolderIdentity()}
+        </DrawerItem>
+
+        <DrawerItem name="Lease Duration Seconds">
+          {lease.getLeaseDurationSeconds()}
+        </DrawerItem>
+
+        <DrawerItem name="Lease Transitions" hidden={lease.getLeaseTransitions() === undefined}>
+          {lease.getLeaseTransitions()}
+        </DrawerItem>
+
+        <DrawerItem name="Acquire Time" hidden={lease.getAcquireTime() === ""}>
+          {lease.getAcquireTime()}
+        </DrawerItem>
+
+        <DrawerItem name="Renew Time">
+          {lease.getRenewTime()}
+        </DrawerItem>
+
+      </div >
+    );
+  }
+}
diff --git a/src/renderer/components/+config-leases/leases-route-component.injectable.ts b/src/renderer/components/+config-leases/leases-route-component.injectable.ts
new file mode 100644
index 0000000000..ef0ffbf37d
--- /dev/null
+++ b/src/renderer/components/+config-leases/leases-route-component.injectable.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { Leases } from "./leases";
+import leasesRouteInjectable from "../../../common/front-end-routing/routes/cluster/config/leases/leases-route.injectable";
+import { routeSpecificComponentInjectionToken } from "../../routes/route-specific-component-injection-token";
+
+const leasesRouteComponentInjectable = getInjectable({
+  id: "leases-route-component",
+
+  instantiate: (di) => ({
+    route: di.inject(leasesRouteInjectable),
+    Component: Leases,
+  }),
+
+  injectionToken: routeSpecificComponentInjectionToken,
+});
+
+export default leasesRouteComponentInjectable;
diff --git a/src/renderer/components/+config-leases/leases-sidebar-items.injectable.tsx b/src/renderer/components/+config-leases/leases-sidebar-items.injectable.tsx
new file mode 100644
index 0000000000..178cf8a172
--- /dev/null
+++ b/src/renderer/components/+config-leases/leases-sidebar-items.injectable.tsx
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+
+import leasesRouteInjectable from "../../../common/front-end-routing/routes/cluster/config/leases/leases-route.injectable";
+import { configSidebarItemId } from "../+config/config-sidebar-items.injectable";
+import { sidebarItemsInjectionToken } from "../layout/sidebar-items.injectable";
+import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
+import navigateToLeasesInjectable from "../../../common/front-end-routing/routes/cluster/config/leases/navigate-to-leases.injectable";
+
+const leasesSidebarItemsInjectable = getInjectable({
+  id: "leases-sidebar-items",
+
+  instantiate: (di) => {
+    const route = di.inject(leasesRouteInjectable);
+    const navigateToLeases = di.inject(navigateToLeasesInjectable);
+    const routeIsActive = di.inject(routeIsActiveInjectable, route);
+
+    return computed(() => [
+      {
+        id: "leases",
+        parentId: configSidebarItemId,
+        title: "Leases",
+        onClick: navigateToLeases,
+        isActive: routeIsActive,
+        isVisible: route.isEnabled,
+        orderNumber: 80,
+      },
+    ]);
+  },
+
+  injectionToken: sidebarItemsInjectionToken,
+});
+
+export default leasesSidebarItemsInjectable;
diff --git a/src/renderer/components/+config-leases/leases.scss b/src/renderer/components/+config-leases/leases.scss
new file mode 100644
index 0000000000..ab7cbce494
--- /dev/null
+++ b/src/renderer/components/+config-leases/leases.scss
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+.Leases {
+  .TableCell {
+    &.name {
+      flex: 2;
+    }
+
+    &.warning {
+      @include table-cell-warning;
+    }
+
+    &.keys {
+      flex: 2.5;
+    }
+
+    &.age {
+      flex: .5;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/renderer/components/+config-leases/leases.tsx b/src/renderer/components/+config-leases/leases.tsx
new file mode 100644
index 0000000000..1c665762ad
--- /dev/null
+++ b/src/renderer/components/+config-leases/leases.tsx
@@ -0,0 +1,87 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import "./leases.scss";
+
+import * as React from "react";
+import { observer } from "mobx-react";
+import type { Lease } from "../../../common/k8s-api/endpoints/lease.api";
+import { KubeObjectStatusIcon } from "../kube-object-status-icon";
+import type { KubeObjectDetailsProps } from "../kube-object-details";
+import { KubeObjectListLayout } from "../kube-object-list-layout";
+import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
+import { KubeObjectAge } from "../kube-object/age";
+import { autoBind } from "../../../common/utils";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import leaseStoreInjectable from "./store.injectable";
+import type { LeaseStore } from "./store";
+
+enum columnId {
+  name = "name",
+  namespace = "namespace",
+  holder = "holder",
+  age = "age",
+}
+
+export interface LeaseProps extends KubeObjectDetailsProps<Lease> {
+}
+
+interface Dependencies {
+  leaseStore: LeaseStore;
+}
+
+@observer
+class NonInjectedLease extends React.Component<LeaseProps & Dependencies> {
+  constructor(props: LeaseProps & Dependencies) {
+    super(props);
+    autoBind(this);
+  }
+
+  render() {
+    const { leaseStore } = this.props;
+
+    return (
+      <SiblingsInTabLayout>
+        <KubeObjectListLayout
+          isConfigurable
+          tableId="configuration_leases"
+          className="Leases"
+          store={leaseStore}
+          sortingCallbacks={{
+            [columnId.name]: lease => lease.getName(),
+            [columnId.namespace]: lease => lease.getNs(),
+            [columnId.holder]: lease => lease.getHolderIdentity(),
+            [columnId.age]: lease => -lease.getCreationTimestamp(),
+          }}
+          searchFilters={[
+            lease => lease.getSearchFields(),
+          ]}
+          renderHeaderTitle="Leases"
+          renderTableHeader={[
+            { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name },
+            { className: "warning", showWithColumn: columnId.name },
+            { title: "Namespace", className: "namespace", sortBy: columnId.namespace, id: columnId.namespace },
+            { title: "Holder", className: "holder", sortBy: columnId.holder, id: columnId.holder },
+            { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age },
+          ]}
+          renderTableContents={lease => [
+            lease.getName(),
+            <KubeObjectStatusIcon key="icon" object={lease} />,
+            lease.getNs(),
+            lease.getHolderIdentity(),
+            <KubeObjectAge key="age" object={lease} />,
+          ]}
+        />
+      </SiblingsInTabLayout>
+    );
+  }
+}
+
+export const Leases = withInjectables<Dependencies, LeaseProps>(NonInjectedLease, {
+  getProps: (di, props) => ({
+    ...props,
+    leaseStore: di.inject(leaseStoreInjectable),
+  }),
+});
diff --git a/src/renderer/components/+config-leases/store.injectable.ts b/src/renderer/components/+config-leases/store.injectable.ts
new file mode 100644
index 0000000000..b9dda24b07
--- /dev/null
+++ b/src/renderer/components/+config-leases/store.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import assert from "assert";
+import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
+import leaseApiInjectable from "../../../common/k8s-api/endpoints/lease.api.injectable";
+import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
+import { LeaseStore } from "./store";
+
+const leaseStoreInjectable = getInjectable({
+  id: "lease-store",
+  instantiate: (di) => {
+    assert(di.inject(storesAndApisCanBeCreatedInjectable), "leaseStore is only available in certain environments");
+
+    const api = di.inject(leaseApiInjectable);
+
+    return new LeaseStore(api);
+  },
+  injectionToken: kubeObjectStoreInjectionToken,
+});
+
+export default leaseStoreInjectable;
diff --git a/src/renderer/components/+config-leases/store.ts b/src/renderer/components/+config-leases/store.ts
new file mode 100644
index 0000000000..db19aed8dd
--- /dev/null
+++ b/src/renderer/components/+config-leases/store.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store";
+import type { Lease, LeaseApi } from "../../../common/k8s-api/endpoints/lease.api";
+
+export class LeaseStore extends KubeObjectStore<Lease, LeaseApi> {
+}
diff --git a/src/renderer/components/+config-priority-classes/priority-classes-items.injectable.tsx b/src/renderer/components/+config-priority-classes/priority-classes-items.injectable.tsx
index bc2512714f..2823467fdf 100644
--- a/src/renderer/components/+config-priority-classes/priority-classes-items.injectable.tsx
+++ b/src/renderer/components/+config-priority-classes/priority-classes-items.injectable.tsx
@@ -27,7 +27,7 @@ const priorityClassesSidebarItemsInjectable = getInjectable({
         onClick: navigateToPriorityClasses,
         isActive: routeIsActive,
         isVisible: route.isEnabled,
-        orderNumber: 60,
+        orderNumber: 70,
       },
     ]);
   },
diff --git a/src/renderer/components/+config-priority-classes/priority-classes-route-component.injectable.ts b/src/renderer/components/+config-priority-classes/priority-classes-route-component.injectable.ts
index 01d7aceb24..258d3eb336 100644
--- a/src/renderer/components/+config-priority-classes/priority-classes-route-component.injectable.ts
+++ b/src/renderer/components/+config-priority-classes/priority-classes-route-component.injectable.ts
@@ -7,7 +7,7 @@ import { PriorityClasses } from "./priority-classes";
 import priorityClassesRouteInjectable from "../../../common/front-end-routing/routes/cluster/config/priority-classes/priority-classes-route.injectable";
 import { routeSpecificComponentInjectionToken } from "../../routes/route-specific-component-injection-token";
 
-const podDisruptionBudgetsRouteComponentInjectable = getInjectable({
+const priorityClassesRouteComponentInjectable = getInjectable({
   id: "priority-classes-route-component",
 
   instantiate: (di) => ({
@@ -18,4 +18,4 @@ const podDisruptionBudgetsRouteComponentInjectable = getInjectable({
   injectionToken: routeSpecificComponentInjectionToken,
 });
 
-export default podDisruptionBudgetsRouteComponentInjectable;
+export default priorityClassesRouteComponentInjectable;
diff --git a/src/common/k8s-api/index.ts b/src/renderer/components/+config-runtime-classes/index.ts
similarity index 65%
rename from src/common/k8s-api/index.ts
rename to src/renderer/components/+config-runtime-classes/index.ts
index 0d47a643f3..ff91dc6016 100644
--- a/src/common/k8s-api/index.ts
+++ b/src/renderer/components/+config-runtime-classes/index.ts
@@ -3,5 +3,5 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-export { apiBase } from "./api-base";
-export { apiKube } from "./api-kube";
+export * from "./runtime-classes";
+export * from "./runtime-classes-details";
diff --git a/src/renderer/components/+config-runtime-classes/runtime-classes-details-tolerations.scss b/src/renderer/components/+config-runtime-classes/runtime-classes-details-tolerations.scss
new file mode 100644
index 0000000000..f72acb7bc9
--- /dev/null
+++ b/src/renderer/components/+config-runtime-classes/runtime-classes-details-tolerations.scss
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+.RuntimeClassDetailsTolerations {
+  grid-template-columns: auto;
+
+  .RuntimeClassTolerations {
+    margin-top: var(--margin);
+  }
+
+  // Expanding value cell to cover 2 columns (whole Drawer width)
+
+  >.name {
+    grid-row-start: 1;
+    grid-column-start: 1;
+  }
+
+  >.value {
+    grid-row-start: 1;
+    grid-column-start: 1;
+  }
+
+  .DrawerParamToggler>.params {
+    margin-left: var(--drawer-item-title-width);
+  }
+}
\ No newline at end of file
diff --git a/src/renderer/components/+config-runtime-classes/runtime-classes-details-tolerations.tsx b/src/renderer/components/+config-runtime-classes/runtime-classes-details-tolerations.tsx
new file mode 100644
index 0000000000..c06e0c63bc
--- /dev/null
+++ b/src/renderer/components/+config-runtime-classes/runtime-classes-details-tolerations.tsx
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import "./runtime-classes-details-tolerations.scss";
+import React from "react";
+import { DrawerParamToggler, DrawerItem } from "../drawer";
+import type { Toleration, KubeObject } from "../../../common/k8s-api/kube-object";
+import { RuntimeClassTolerations } from "./runtime-classes-tolerations";
+
+export interface KubeObjectWithTolerations extends KubeObject {
+  getTolerations(): Toleration[];
+}
+
+export interface RuntimeClassDetailsTolerationsProps {
+  runtimeClass: KubeObjectWithTolerations;
+}
+
+export function RuntimeClassDetailsTolerations({ runtimeClass: runtimeClass }: RuntimeClassDetailsTolerationsProps) {
+  const tolerations = runtimeClass.getTolerations();
+
+  if (!tolerations.length) return null;
+
+  return (
+    <DrawerItem name="Tolerations" className="RuntimeClassDetailsTolerations">
+      <DrawerParamToggler label={tolerations.length}>
+        <RuntimeClassTolerations tolerations={tolerations} />
+      </DrawerParamToggler>
+    </DrawerItem>
+  );
+}
diff --git a/src/renderer/components/+preferences/index.tsx b/src/renderer/components/+config-runtime-classes/runtime-classes-details.scss
similarity index 82%
rename from src/renderer/components/+preferences/index.tsx
rename to src/renderer/components/+config-runtime-classes/runtime-classes-details.scss
index 10c9caf54b..55c5abcc09 100644
--- a/src/renderer/components/+preferences/index.tsx
+++ b/src/renderer/components/+config-runtime-classes/runtime-classes-details.scss
@@ -3,4 +3,4 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-export * from "./preferences";
+.RuntimeClassesDetails {}
\ No newline at end of file
diff --git a/src/renderer/components/+config-runtime-classes/runtime-classes-details.tsx b/src/renderer/components/+config-runtime-classes/runtime-classes-details.tsx
new file mode 100644
index 0000000000..309c2a73bd
--- /dev/null
+++ b/src/renderer/components/+config-runtime-classes/runtime-classes-details.tsx
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import "./runtime-classes.scss";
+
+import React from "react";
+import { observer } from "mobx-react";
+import { DrawerItem } from "../drawer";
+import type { KubeObjectDetailsProps } from "../kube-object-details";
+import type { RuntimeClass } from "../../../common/k8s-api/endpoints";
+import { KubeObjectMeta } from "../kube-object-meta";
+import { Badge } from "../badge";
+import { RuntimeClassDetailsTolerations } from "./runtime-classes-details-tolerations";
+
+export interface RuntimeClassesDetailsProps extends KubeObjectDetailsProps<RuntimeClass> {
+}
+
+@observer
+export class RuntimeClassesDetails extends React.Component<RuntimeClassesDetailsProps> {
+
+  render() {
+    const { object: rc } = this.props;
+    const nodeSelector = rc.getNodeSelectors();
+
+    return (
+      <div className="RuntimeClassesDetails">
+        <KubeObjectMeta object={rc} />
+
+        <DrawerItem name="Handler">
+          {rc.getHandler()}
+        </DrawerItem>
+
+        <DrawerItem name="Pod Fixed" hidden={rc.getPodFixed() === ""}>
+          {rc.getPodFixed()}
+        </DrawerItem>
+
+        <DrawerItem name="Node Selector" hidden={nodeSelector.length === 0}>
+          {nodeSelector.map(label => <Badge key={label} label={label} />)}
+        </DrawerItem>
+
+        <RuntimeClassDetailsTolerations runtimeClass={rc} />
+
+      </div>
+    );
+  }
+}
diff --git a/src/renderer/components/+config-runtime-classes/runtime-classes-items.injectable.tsx b/src/renderer/components/+config-runtime-classes/runtime-classes-items.injectable.tsx
new file mode 100644
index 0000000000..352504ca00
--- /dev/null
+++ b/src/renderer/components/+config-runtime-classes/runtime-classes-items.injectable.tsx
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+
+import runtimeClassesRouteInjectable from "../../../common/front-end-routing/routes/cluster/config/runtime-classes/runtime-classes-route.injectable";
+import { configSidebarItemId } from "../+config/config-sidebar-items.injectable";
+import { sidebarItemsInjectionToken } from "../layout/sidebar-items.injectable";
+import routeIsActiveInjectable from "../../routes/route-is-active.injectable";
+import navigateToRuntimeClassesInjectable from "../../../common/front-end-routing/routes/cluster/config/runtime-classes/navigate-to-runtime-classes.injectable";
+
+const runtimeClassesSidebarItemsInjectable = getInjectable({
+  id: "runtime-classes-sidebar-items",
+
+  instantiate: (di) => {
+    const route = di.inject(runtimeClassesRouteInjectable);
+    const navigateToRuntimeClasses = di.inject(navigateToRuntimeClassesInjectable);
+    const routeIsActive = di.inject(routeIsActiveInjectable, route);
+
+    return computed(() => [
+      {
+        id: "runtime-classes",
+        parentId: configSidebarItemId,
+        title: "Runtime Classes",
+        onClick: navigateToRuntimeClasses,
+        isActive: routeIsActive,
+        isVisible: route.isEnabled,
+        orderNumber: 70,
+      },
+    ]);
+  },
+
+  injectionToken: sidebarItemsInjectionToken,
+});
+
+export default runtimeClassesSidebarItemsInjectable;
diff --git a/src/renderer/components/+preferences/terminal-preferences-route-component.injectable.ts b/src/renderer/components/+config-runtime-classes/runtime-classes-route-component.injectable.ts
similarity index 50%
rename from src/renderer/components/+preferences/terminal-preferences-route-component.injectable.ts
rename to src/renderer/components/+config-runtime-classes/runtime-classes-route-component.injectable.ts
index e23a4520a8..5118cdcc08 100644
--- a/src/renderer/components/+preferences/terminal-preferences-route-component.injectable.ts
+++ b/src/renderer/components/+config-runtime-classes/runtime-classes-route-component.injectable.ts
@@ -3,19 +3,19 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
+import { RuntimeClasses } from "./runtime-classes";
+import runtimeClassesRouteInjectable from "../../../common/front-end-routing/routes/cluster/config/runtime-classes/runtime-classes-route.injectable";
 import { routeSpecificComponentInjectionToken } from "../../routes/route-specific-component-injection-token";
-import terminalPreferencesRouteInjectable from "../../../common/front-end-routing/routes/preferences/terminal/terminal-preferences-route.injectable";
-import { Terminal } from "./terminal";
 
-const terminalPreferencesRouteComponentInjectable = getInjectable({
-  id: "terminal-preferences-route-component",
+const runtimeClassesRouteComponentInjectable = getInjectable({
+  id: "runtime-classes-route-component",
 
   instantiate: (di) => ({
-    route: di.inject(terminalPreferencesRouteInjectable),
-    Component: Terminal,
+    route: di.inject(runtimeClassesRouteInjectable),
+    Component: RuntimeClasses,
   }),
 
   injectionToken: routeSpecificComponentInjectionToken,
 });
 
-export default terminalPreferencesRouteComponentInjectable;
+export default runtimeClassesRouteComponentInjectable;
diff --git a/src/renderer/components/+config-runtime-classes/runtime-classes-tolerations.scss b/src/renderer/components/+config-runtime-classes/runtime-classes-tolerations.scss
new file mode 100644
index 0000000000..e398f7424a
--- /dev/null
+++ b/src/renderer/components/+config-runtime-classes/runtime-classes-tolerations.scss
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+.RuntimeClassTolerations {
+  .TableHead {
+    background-color: var(--drawerSubtitleBackground);
+  }
+
+  .TableCell {
+    white-space: normal;
+    word-break: normal;
+
+    &.key {
+      flex-grow: 3;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/renderer/components/+config-runtime-classes/runtime-classes-tolerations.tsx b/src/renderer/components/+config-runtime-classes/runtime-classes-tolerations.tsx
new file mode 100644
index 0000000000..bcb1776459
--- /dev/null
+++ b/src/renderer/components/+config-runtime-classes/runtime-classes-tolerations.tsx
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import "./runtime-classes-tolerations.scss";
+import React from "react";
+import uniqueId from "lodash/uniqueId";
+
+import type { Toleration } from "../../../common/k8s-api/kube-object";
+import { Table, TableCell, TableHead, TableRow } from "../table";
+
+export interface RuntimeClassTolerationsProps {
+  tolerations: Toleration[];
+}
+
+enum sortBy {
+  Key = "key",
+  Operator = "operator",
+  Effect = "effect",
+  Seconds = "seconds",
+  Value = "value",
+}
+
+const getTableRow = (toleration: Toleration) => {
+  const { key, operator, effect, tolerationSeconds, value } = toleration;
+
+  return (
+    <TableRow
+      key={uniqueId("toleration-")}
+      sortItem={toleration}
+      nowrap
+    >
+      <TableCell className="key">{key}</TableCell>
+      <TableCell className="operator">{operator}</TableCell>
+      <TableCell className="value">{value}</TableCell>
+      <TableCell className="effect">{effect}</TableCell>
+      <TableCell className="seconds">{tolerationSeconds}</TableCell>
+    </TableRow>
+  );
+};
+
+export function RuntimeClassTolerations({ tolerations }: RuntimeClassTolerationsProps) {
+  return (
+    <Table
+      tableId="workloads_pod_tolerations"
+      selectable
+      items={tolerations}
+      scrollable={false}
+      sortable={{
+        [sortBy.Key]: toleration => toleration.key,
+        [sortBy.Operator]: toleration => toleration.operator,
+        [sortBy.Effect]: toleration => toleration.effect,
+        [sortBy.Seconds]: toleration => toleration.tolerationSeconds,
+      }}
+      sortSyncWithUrl={false}
+      className="RuntimeClassTolerations"
+      renderRow={getTableRow}
+    >
+      <TableHead sticky={false}>
+        <TableCell className="key" sortBy={sortBy.Key}>Key</TableCell>
+        <TableCell className="operator" sortBy={sortBy.Operator}>Operator</TableCell>
+        <TableCell className="value" sortBy={sortBy.Value}>Value</TableCell>
+        <TableCell className="effect" sortBy={sortBy.Effect}>Effect</TableCell>
+        <TableCell className="seconds" sortBy={sortBy.Seconds}>Seconds</TableCell>
+      </TableHead>
+    </Table>
+  );
+}
diff --git a/src/renderer/components/+config-runtime-classes/runtime-classes.scss b/src/renderer/components/+config-runtime-classes/runtime-classes.scss
new file mode 100644
index 0000000000..0f3b151059
--- /dev/null
+++ b/src/renderer/components/+config-runtime-classes/runtime-classes.scss
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+.RuntimeClasses {
+  .TableCell {
+    &.name {
+      flex: 2;
+    }
+
+    &.warning {
+      @include table-cell-warning;
+    }
+
+    &.keys {
+      flex: 2.5;
+    }
+
+    &.age {
+      flex: .5;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/renderer/components/+config-runtime-classes/runtime-classes.tsx b/src/renderer/components/+config-runtime-classes/runtime-classes.tsx
new file mode 100644
index 0000000000..990912f2d4
--- /dev/null
+++ b/src/renderer/components/+config-runtime-classes/runtime-classes.tsx
@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import "./runtime-classes.scss";
+
+import * as React from "react";
+import { observer } from "mobx-react";
+import type { RuntimeClass } from "../../../common/k8s-api/endpoints/runtime-class.api";
+import { KubeObjectStatusIcon } from "../kube-object-status-icon";
+import type { KubeObjectDetailsProps } from "../kube-object-details";
+import { KubeObjectListLayout } from "../kube-object-list-layout";
+import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
+import { KubeObjectAge } from "../kube-object/age";
+import { autoBind } from "../../../common/utils";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import runtimeClassStoreInjectable from "./store.injectable";
+import type { RuntimeClassStore } from "./store";
+
+enum columnId {
+  name = "name",
+  handler = "handler",
+  age = "age",
+}
+
+export interface RuntimeClassesProps extends KubeObjectDetailsProps<RuntimeClass> {
+}
+
+interface Dependencies {
+  runtimeClassStore: RuntimeClassStore;
+}
+
+@observer
+class NonInjectedRuntimeClasses extends React.Component<RuntimeClassesProps & Dependencies> {
+  constructor(props: RuntimeClassesProps & Dependencies) {
+    super(props);
+    autoBind(this);
+  }
+
+  render() {
+    const { runtimeClassStore } = this.props;
+
+    return (
+      <SiblingsInTabLayout>
+        <KubeObjectListLayout
+          isConfigurable
+          tableId="configuration_runtime_classes"
+          className="RuntimeClasses"
+          store={runtimeClassStore}
+          sortingCallbacks={{
+            [columnId.name]: rc => rc.getName(),
+            [columnId.handler]: rc => rc.getHandler(),
+            [columnId.age]: rc => -rc.getCreationTimestamp(),
+          }}
+          searchFilters={[
+            rc => rc.getSearchFields(),
+          ]}
+          renderHeaderTitle="Runtime Classes"
+          renderTableHeader={[
+            { title: "Name", className: "name", sortBy: columnId.name, id: columnId.name },
+            { className: "warning", showWithColumn: columnId.name },
+            { title: "Handler", className: "handler", sortBy: columnId.handler, id: columnId.handler },
+            { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age },
+          ]}
+          renderTableContents={rc => [
+            rc.getName(),
+            <KubeObjectStatusIcon key="icon" object={rc} />,
+            rc.getHandler(),
+            <KubeObjectAge key="age" object={rc} />,
+          ]}
+        />
+      </SiblingsInTabLayout>
+    );
+  }
+}
+
+export const RuntimeClasses = withInjectables<Dependencies, RuntimeClassesProps>(NonInjectedRuntimeClasses, {
+  getProps: (di, props) => ({
+    ...props,
+    runtimeClassStore: di.inject(runtimeClassStoreInjectable),
+  }),
+});
diff --git a/src/renderer/components/+config-runtime-classes/store.injectable.ts b/src/renderer/components/+config-runtime-classes/store.injectable.ts
new file mode 100644
index 0000000000..0a4a21d716
--- /dev/null
+++ b/src/renderer/components/+config-runtime-classes/store.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import assert from "assert";
+import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
+import runtimeClassApiInjectable from "../../../common/k8s-api/endpoints/runtime-class.api.injectable";
+import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
+import { RuntimeClassStore } from "./store";
+
+const runtimeClassStoreInjectable = getInjectable({
+  id: "runtime-class-store",
+  instantiate: (di) => {
+    assert(di.inject(storesAndApisCanBeCreatedInjectable), "runtimeClassStore is only available in certain environments");
+
+    const api = di.inject(runtimeClassApiInjectable);
+
+    return new RuntimeClassStore(api);
+  },
+  injectionToken: kubeObjectStoreInjectionToken,
+});
+
+export default runtimeClassStoreInjectable;
diff --git a/src/renderer/components/+config-runtime-classes/store.ts b/src/renderer/components/+config-runtime-classes/store.ts
new file mode 100644
index 0000000000..bdb849ac85
--- /dev/null
+++ b/src/renderer/components/+config-runtime-classes/store.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store";
+import type { RuntimeClass, RuntimeClassApi } from "../../../common/k8s-api/endpoints/runtime-class.api";
+
+export class RuntimeClassStore extends KubeObjectStore<RuntimeClass, RuntimeClassApi> {
+}
diff --git a/src/renderer/components/+custom-resources/__tests__/__snapshots__/custom-resource-details.test.tsx.snap b/src/renderer/components/+custom-resources/__tests__/__snapshots__/custom-resource-details.test.tsx.snap
index d3e0cd1d5a..f15bde7996 100644
--- a/src/renderer/components/+custom-resources/__tests__/__snapshots__/custom-resource-details.test.tsx.snap
+++ b/src/renderer/components/+custom-resources/__tests__/__snapshots__/custom-resource-details.test.tsx.snap
@@ -45,11 +45,7 @@ exports[`<CustomResourceDetails /> with a CRD with a boolean field should displa
       <span
         class="value"
       >
-        <ul>
-          <li>
-            false
-          </li>
-        </ul>
+        false
       </span>
     </div>
   </div>
@@ -101,11 +97,7 @@ exports[`<CustomResourceDetails /> with a CRD with a boolean field should displa
       <span
         class="value"
       >
-        <ul>
-          <li>
-            true
-          </li>
-        </ul>
+        true
       </span>
     </div>
   </div>
@@ -157,11 +149,7 @@ exports[`<CustomResourceDetails /> with a CRD with a number field should display
       <span
         class="value"
       >
-        <ul>
-          <li>
-            0
-          </li>
-        </ul>
+        0
       </span>
     </div>
   </div>
@@ -213,11 +201,7 @@ exports[`<CustomResourceDetails /> with a CRD with a number field should display
       <span
         class="value"
       >
-        <ul>
-          <li>
-            1234
-          </li>
-        </ul>
+        1234
       </span>
     </div>
   </div>
diff --git a/src/renderer/components/+custom-resources/crd-resource-details.tsx b/src/renderer/components/+custom-resources/crd-resource-details.tsx
index a52d60c7ee..3bd1e821fa 100644
--- a/src/renderer/components/+custom-resources/crd-resource-details.tsx
+++ b/src/renderer/components/+custom-resources/crd-resource-details.tsx
@@ -15,11 +15,10 @@ import { KubeObjectMeta } from "../kube-object-meta";
 import { Input } from "../input";
 import type { AdditionalPrinterColumnsV1 } from "../../../common/k8s-api/endpoints/custom-resource-definition.api";
 import { CustomResourceDefinition } from "../../../common/k8s-api/endpoints/custom-resource-definition.api";
-import { convertKubectlJsonPathToNodeJsonPath } from "../../utils/jsonPath";
+import { safeJSONPathValue } from "../../utils/jsonPath";
 import type { KubeObjectMetadata, KubeObjectStatus } from "../../../common/k8s-api/kube-object";
 import { KubeObject } from "../../../common/k8s-api/kube-object";
 import logger from "../../../common/logger";
-import { JSONPath } from "@astronautlabs/jsonpath";
 
 export interface CustomResourceDetailsProps extends KubeObjectDetailsProps<KubeObject> {
   crd: CustomResourceDefinition;
@@ -66,7 +65,7 @@ export class CustomResourceDetails extends React.Component<CustomResourceDetails
   renderAdditionalColumns(resource: KubeObject, columns: AdditionalPrinterColumnsV1[]) {
     return columns.map(({ name, jsonPath }) => (
       <DrawerItem key={name} name={name}>
-        {convertSpecValue(JSONPath.query(resource, convertKubectlJsonPathToNodeJsonPath(jsonPath)))}
+        {convertSpecValue(safeJSONPathValue(resource, jsonPath))}
       </DrawerItem>
     ));
   }
diff --git a/src/renderer/components/+custom-resources/crd-resources.tsx b/src/renderer/components/+custom-resources/crd-resources.tsx
index 7b3d87529f..ca8884bcd3 100644
--- a/src/renderer/components/+custom-resources/crd-resources.tsx
+++ b/src/renderer/components/+custom-resources/crd-resources.tsx
@@ -11,7 +11,7 @@ import { KubeObjectListLayout } from "../kube-object-list-layout";
 import type { IComputedValue } from "mobx";
 import { computed, makeObservable } from "mobx";
 import type { ApiManager } from "../../../common/k8s-api/api-manager";
-import { safeJSONPathValue } from "../../utils/jsonPath";
+import { formatJSONValue, safeJSONPathValue } from "../../utils/jsonPath";
 import { TabLayout } from "../layout/tab-layout-2";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import customResourcesRouteParametersInjectable from "./custom-resources-route-parameters.injectable";
@@ -73,7 +73,7 @@ class NonInjectedCustomResources extends React.Component<Dependencies> {
             [columnId.age]: customResource => -customResource.getCreationTimestamp(),
             ...Object.fromEntries(extraColumns.map(({ name, jsonPath }) => [
               name,
-              customResource => safeJSONPathValue(customResource, jsonPath),
+              customResource => formatJSONValue(safeJSONPathValue(customResource, jsonPath)),
             ])),
           }}
           searchFilters={[
diff --git a/src/renderer/components/+entity-settings/entity-settings.module.scss b/src/renderer/components/+entity-settings/entity-settings.module.scss
index 087630e28f..f8aef3385f 100644
--- a/src/renderer/components/+entity-settings/entity-settings.module.scss
+++ b/src/renderer/components/+entity-settings/entity-settings.module.scss
@@ -16,3 +16,9 @@
 .settingsAvatar {
   margin: 0 10px;
 }
+
+.avatarAndName {
+  display: flex;
+  align-items: center;
+  margin-bottom: var(--margin);
+}
\ No newline at end of file
diff --git a/src/renderer/components/+entity-settings/entity-settings.tsx b/src/renderer/components/+entity-settings/entity-settings.tsx
index 366f5758f6..b1c672ae2e 100644
--- a/src/renderer/components/+entity-settings/entity-settings.tsx
+++ b/src/renderer/components/+entity-settings/entity-settings.tsx
@@ -86,7 +86,7 @@ class NonInjectedEntitySettings extends React.Component<Dependencies> {
 
     return (
       <>
-        <div className="flex items-center pb-8">
+        <div className={styles.avatarAndName}>
           <Avatar
             title={entity.getName()}
             colorHash={`${entity.getName()}-${entity.metadata.source}`}
diff --git a/src/renderer/components/+extensions/__tests__/extensions.test.tsx b/src/renderer/components/+extensions/__tests__/extensions.test.tsx
index 5de9e15f1f..27db8da81a 100644
--- a/src/renderer/components/+extensions/__tests__/extensions.test.tsx
+++ b/src/renderer/components/+extensions/__tests__/extensions.test.tsx
@@ -5,14 +5,11 @@
 
 import "@testing-library/jest-dom/extend-expect";
 import { fireEvent, screen, waitFor } from "@testing-library/react";
-import fse from "fs-extra";
 import React from "react";
 import type { ExtensionDiscovery } from "../../../../extensions/extension-discovery/extension-discovery";
 import type { ExtensionLoader } from "../../../../extensions/extension-loader";
 import { ConfirmDialog } from "../../confirm-dialog";
 import { Extensions } from "../extensions";
-import mockFs from "mock-fs";
-import { mockWindow } from "../../../../../__mocks__/windowMock";
 import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
 import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
 import type { DiRender } from "../../test-utils/renderFor";
@@ -20,41 +17,28 @@ import { renderFor } from "../../test-utils/renderFor";
 import extensionDiscoveryInjectable from "../../../../extensions/extension-discovery/extension-discovery.injectable";
 import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import directoryForDownloadsInjectable from "../../../../common/app-paths/directory-for-downloads/directory-for-downloads.injectable";
-import getConfigurationFileModelInjectable from "../../../../common/get-configuration-file-model/get-configuration-file-model.injectable";
 import assert from "assert";
-import type { InstallFromInput } from "../install-from-input/install-from-input";
-import installFromInputInjectable from "../install-from-input/install-from-input.injectable";
+import type { InstallExtensionFromInput } from "../install-extension-from-input.injectable";
+import installExtensionFromInputInjectable from "../install-extension-from-input.injectable";
 import type { ExtensionInstallationStateStore } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store";
 import extensionInstallationStateStoreInjectable from "../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
 import { observable, when } from "mobx";
-
-mockWindow();
-
-jest.setTimeout(30000);
-jest.mock("fs-extra");
-jest.mock("../../notifications");
-
-jest.mock("../../../../common/utils/downloadFile", () => ({
-  downloadFile: jest.fn(({ url }) => ({
-    promise: Promise.resolve(),
-    url,
-    cancel: () => {},
-  })),
-  downloadJson: jest.fn(({ url }) => ({
-    promise: Promise.resolve({}),
-    url,
-    cancel: () => { },
-  })),
-}));
-
-jest.mock("../../../../common/utils/tar");
+import type { DeleteFile } from "../../../../common/fs/delete-file.injectable";
+import deleteFileInjectable from "../../../../common/fs/delete-file.injectable";
+import type { DownloadJson } from "../../../../common/fetch/download-json.injectable";
+import type { DownloadBinary } from "../../../../common/fetch/download-binary.injectable";
+import downloadJsonInjectable from "../../../../common/fetch/download-json.injectable";
+import downloadBinaryInjectable from "../../../../common/fetch/download-binary.injectable";
 
 describe("Extensions", () => {
   let extensionLoader: ExtensionLoader;
   let extensionDiscovery: ExtensionDiscovery;
-  let installFromInput: jest.MockedFunction<InstallFromInput>;
+  let installExtensionFromInput: jest.MockedFunction<InstallExtensionFromInput>;
   let extensionInstallationStateStore: ExtensionInstallationStateStore;
   let render: DiRender;
+  let deleteFileMock: jest.MockedFunction<DeleteFile>;
+  let downloadJson: jest.MockedFunction<DownloadJson>;
+  let downloadBinary: jest.MockedFunction<DownloadBinary>;
 
   beforeEach(() => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
@@ -62,17 +46,19 @@ describe("Extensions", () => {
     di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
     di.override(directoryForDownloadsInjectable, () => "some-directory-for-downloads");
 
-    di.permitSideEffects(getConfigurationFileModelInjectable);
-
-    mockFs({
-      "some-directory-for-user-data": {},
-    });
-
     render = renderFor(di);
 
-    installFromInput = jest.fn();
+    installExtensionFromInput = jest.fn();
+    di.override(installExtensionFromInputInjectable, () => installExtensionFromInput);
 
-    di.override(installFromInputInjectable, () => installFromInput);
+    deleteFileMock = jest.fn();
+    di.override(deleteFileInjectable, () => deleteFileMock);
+
+    downloadJson = jest.fn().mockImplementation((url) => { throw new Error(`Unexpected call to downloadJson for url=${url}`); });
+    di.override(downloadJsonInjectable, () => downloadJson);
+
+    downloadBinary = jest.fn().mockImplementation((url) => { throw new Error(`Unexpected call to downloadJson for url=${url}`); });
+    di.override(downloadBinaryInjectable, () => downloadBinary);
 
     extensionLoader = di.inject(extensionLoaderInjectable);
     extensionDiscovery = di.inject(extensionDiscoveryInjectable);
@@ -95,10 +81,6 @@ describe("Extensions", () => {
     extensionDiscovery.uninstallExtension = jest.fn(() => Promise.resolve());
   });
 
-  afterEach(() => {
-    mockFs.restore();
-  });
-
   it("disables uninstall and disable buttons while uninstalling", async () => {
     extensionDiscovery.isLoaded = true;
 
@@ -123,7 +105,7 @@ describe("Extensions", () => {
     // Approve confirm dialog
     fireEvent.click(await screen.findByText("Yes"));
 
-    await waitFor(() => {
+    await waitFor(async () => {
       expect(extensionDiscovery.uninstallExtension).toHaveBeenCalled();
       fireEvent.click(menuTrigger);
       expect(screen.getByText("Disable")).toHaveAttribute("aria-disabled", "true");
@@ -137,9 +119,10 @@ describe("Extensions", () => {
     render(<Extensions />);
 
     const resolveInstall = observable.box(false);
+    const url = "https://test.extensionurl/package.tgz";
 
-    (fse.unlink as jest.MockedFunction<typeof fse.unlink>).mockReturnValue(Promise.resolve());
-    installFromInput.mockImplementation(async (input) => {
+    deleteFileMock.mockReturnValue(Promise.resolve());
+    installExtensionFromInput.mockImplementation(async (input) => {
       expect(input).toBe("https://test.extensionurl/package.tgz");
 
       const clear = extensionInstallationStateStore.startPreInstall();
@@ -152,13 +135,26 @@ describe("Extensions", () => {
       exact: false,
     }), {
       target: {
-        value: "https://test.extensionurl/package.tgz",
+        value: url,
       },
     });
 
+    const doResolve = observable.box(false);
+
+    downloadBinary.mockImplementation(async (targetUrl) => {
+      expect(targetUrl).toBe(url);
+
+      await when(() => doResolve.get());
+
+      return {
+        callWasSuccessful: false,
+        error: "unknown location",
+      };
+    });
+
     fireEvent.click(await screen.findByText("Install"));
     expect((await screen.findByText("Install")).closest("button")).toBeDisabled();
-    resolveInstall.set(true);
+    doResolve.set(true);
   });
 
   it("displays spinner while extensions are loading", () => {
diff --git a/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx b/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx
index dd320407a5..317162cc9f 100644
--- a/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx
+++ b/src/renderer/components/+extensions/attempt-install-by-info.injectable.tsx
@@ -2,22 +2,23 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { ExtendableDisposer } from "../../../common/utils";
-import { downloadFile, downloadJson } from "../../../common/utils";
-import { Notifications } from "../notifications";
+import { isObject } from "../../../common/utils";
 import React from "react";
-import path from "path";
 import { SemVer } from "semver";
 import URLParse from "url-parse";
-import type { InstallRequest } from "./attempt-install/install-request";
-import type { ExtensionInstallationStateStore } from "../../../extensions/extension-installation-state-store/extension-installation-state-store";
-import type { Confirm } from "../confirm-dialog/confirm.injectable";
 import { getInjectable } from "@ogre-tools/injectable";
 import attemptInstallInjectable from "./attempt-install/attempt-install.injectable";
 import getBaseRegistryUrlInjectable from "./get-base-registry-url/get-base-registry-url.injectable";
 import extensionInstallationStateStoreInjectable from "../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
 import confirmInjectable from "../confirm-dialog/confirm.injectable";
 import { reduce } from "lodash";
+import getBasenameOfPathInjectable from "../../../common/path/get-basename.injectable";
+import { withTimeout } from "../../../common/fetch/timeout-controller";
+import downloadBinaryInjectable from "../../../common/fetch/download-binary.injectable";
+import downloadJsonInjectable from "../../../common/fetch/download-json.injectable";
+import type { PackageJson } from "type-fest";
+import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 
 export interface ExtensionInfo {
   name: string;
@@ -25,128 +26,180 @@ export interface ExtensionInfo {
   requireConfirmation?: boolean;
 }
 
-export type AttemptInstallByInfo = (info: ExtensionInfo) => Promise<void>;
-
-interface Dependencies {
-  attemptInstall: (request: InstallRequest, d: ExtendableDisposer) => Promise<void>;
-  getBaseRegistryUrl: () => Promise<string>;
-  extensionInstallationStateStore: ExtensionInstallationStateStore;
-  confirm: Confirm;
+interface NpmPackageVersionDescriptor extends PackageJson {
+  dist: {
+    integrity: string;
+    shasum: string;
+    tarball: string;
+  };
 }
 
-const attemptInstallByInfo = ({
-  attemptInstall,
-  getBaseRegistryUrl,
-  extensionInstallationStateStore,
-  confirm,
-}: Dependencies): AttemptInstallByInfo => (
-  async (info) => {
-    const { name, version, requireConfirmation = false } = info;
-    const disposer = extensionInstallationStateStore.startPreInstall();
-    const baseUrl = await getBaseRegistryUrl();
-    const registryUrl = new URLParse(baseUrl).set("pathname", name).toString();
-    let json: any;
-    let finalVersion = version;
+interface NpmRegistryPackageDescriptor {
+  versions: Partial<Record<string, NpmPackageVersionDescriptor>>;
+  "dist-tags"?: Partial<Record<string, string>>;
+}
 
-    try {
-      json = await downloadJson({ url: registryUrl }).promise;
+export type AttemptInstallByInfo = (info: ExtensionInfo) => Promise<void>;
 
-      if (!json || json.error || typeof json.versions !== "object" || !json.versions) {
-        const message = json?.error ? `: ${json.error}` : "";
+const attemptInstallByInfoInjectable = getInjectable({
+  id: "attempt-install-by-info",
+  instantiate: (di): AttemptInstallByInfo => {
+    const attemptInstall = di.inject(attemptInstallInjectable);
+    const getBaseRegistryUrl = di.inject(getBaseRegistryUrlInjectable);
+    const extensionInstallationStateStore = di.inject(extensionInstallationStateStoreInjectable);
+    const confirm = di.inject(confirmInjectable);
+    const getBasenameOfPath = di.inject(getBasenameOfPathInjectable);
+    const downloadJson = di.inject(downloadJsonInjectable);
+    const downloadBinary = di.inject(downloadBinaryInjectable);
+    const showErrorNotification = di.inject(showErrorNotificationInjectable);
+    const logger = di.inject(loggerInjectable);
 
-        Notifications.error(`Failed to get registry information for that extension${message}`);
+    return async (info) => {
+      const { name, version: versionOrTagName, requireConfirmation = false } = info;
+      const disposer = extensionInstallationStateStore.startPreInstall();
+      const baseUrl = await getBaseRegistryUrl();
+      const registryUrl = new URLParse(baseUrl).set("pathname", name).toString();
+      let json: NpmRegistryPackageDescriptor;
+
+      try {
+        const result = await downloadJson(registryUrl);
+
+        if (!result.callWasSuccessful) {
+          showErrorNotification(`Failed to get registry information for extension: ${result.error}`);
+
+          return disposer();
+        }
+
+        if (!isObject(result.response) || Array.isArray(result.response)) {
+          showErrorNotification("Failed to get registry information for extension");
+
+          return disposer();
+        }
+
+        if (result.response.error || !isObject(result.response.versions)) {
+          const message = result.response.error ? `: ${result.response.error}` : "";
+
+          showErrorNotification(`Failed to get registry information for extension${message}`);
+
+          return disposer();
+        }
+
+        json = result.response as unknown as NpmRegistryPackageDescriptor;
+      } catch (error) {
+        if (error instanceof SyntaxError) {
+          // assume invalid JSON
+          logger.warn("Set registry has invalid json", { url: baseUrl }, error);
+          showErrorNotification("Failed to get valid registry information for extension. Registry did not return valid JSON");
+        } else {
+          logger.error("Failed to download registry information", error);
+          showErrorNotification(`Failed to get valid registry information for extension. ${error}`);
+        }
 
         return disposer();
       }
-    } catch (error) {
-      if (error instanceof SyntaxError) {
-        // assume invalid JSON
-        console.warn("Set registry has invalid json", { url: baseUrl }, error);
-        Notifications.error("Failed to get valid registry information for that extension. Registry did not return valid JSON");
-      } else {
-        console.error("Failed to download registry information", error);
-        Notifications.error(`Failed to get valid registry information for that extension. ${error}`);
-      }
 
-      return disposer();
-    }
+      let version = versionOrTagName;
 
-    if (version) {
-      if (!json.versions[version]) {
-        if (json["dist-tags"][version]) {
-          finalVersion = json["dist-tags"][version];
-        } else {
-          Notifications.error((
+      if (versionOrTagName) {
+        validDistTagName:
+        if (!json.versions[versionOrTagName]) {
+          if (json["dist-tags"]) {
+            const potentialVersion = json["dist-tags"][versionOrTagName];
+
+            if (potentialVersion) {
+              if (!json.versions[potentialVersion]) {
+                showErrorNotification((
+                  <p>
+                    Configured registry claims to have tag
+                    {" "}
+                    <code>{versionOrTagName}</code>
+                    .
+                    {" "}
+                    But does not have version infomation for the reference.
+                  </p>
+                ));
+
+                return disposer();
+              }
+
+              version = potentialVersion;
+              break validDistTagName;
+            }
+          }
+
+          showErrorNotification((
             <p>
               {"The "}
               <em>{name}</em>
               {" extension does not have a version or tag "}
-              <code>{version}</code>
+              <code>{versionOrTagName}</code>
               .
             </p>
           ));
 
           return disposer();
         }
+      } else {
+        const versions = Object.keys(json.versions)
+          .map(version => new SemVer(version, { loose: true }))
+          // ignore pre-releases for auto picking the version
+          .filter(version => version.prerelease.length === 0);
+
+        const latestVersion = reduce(versions, (prev, curr) => prev.compareMain(curr) === -1 ? curr : prev);
+
+        version = latestVersion?.format();
       }
-    } else {
-      const versions = Object.keys(json.versions)
-        .map(version => new SemVer(version, { loose: true }))
-        // ignore pre-releases for auto picking the version
-        .filter(version => version.prerelease.length === 0);
 
-      const latestVersion = reduce(versions, (prev, curr) => prev.compareMain(curr) === -1 ? curr : prev);
-
-      if (!latestVersion) {
-        console.error("No versions supplied for that extension", { name });
-        Notifications.error(`No versions found for ${name}`);
+      if (!version) {
+        logger.error("No versions supplied for extension", { name });
+        showErrorNotification(`No versions found for ${name}`);
 
         return disposer();
       }
 
-      finalVersion = latestVersion.format();
-    }
+      const versionInfo = json.versions[version];
+      const tarballUrl = versionInfo?.dist.tarball;
 
-    if (requireConfirmation) {
-      const proceed = await confirm({
-        message: (
-          <p>
-            Are you sure you want to install
-            {" "}
-            <b>
-              {name}
-              @
-              {finalVersion}
-            </b>
-            ?
-          </p>
-        ),
-        labelCancel: "Cancel",
-        labelOk: "Install",
-      });
+      if (!tarballUrl) {
+        showErrorNotification("Configured registry has invalid data model. Please verify that it is like NPM's.");
+        logger.warn(`[ATTEMPT-INSTALL-BY-INFO]: registry returned unexpected data, final version is ${version} but the versions object is missing .dist.tarball as a string`, versionInfo);
 
-      if (!proceed) {
         return disposer();
       }
-    }
 
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const url = json.versions[finalVersion!].dist.tarball;
-    const fileName = path.basename(url);
-    const { promise: dataP } = downloadFile({ url, timeout: 10 * 60 * 1000 });
+      if (requireConfirmation) {
+        const proceed = await confirm({
+          message: (
+            <p>
+              {"Are you sure you want to install "}
+              <b>
+                {`${name}@${version}`}
+              </b>
+              ?
+            </p>
+          ),
+          labelCancel: "Cancel",
+          labelOk: "Install",
+        });
 
-    return attemptInstall({ fileName, dataP }, disposer);
-  }
-);
+        if (!proceed) {
+          return disposer();
+        }
+      }
 
-const attemptInstallByInfoInjectable = getInjectable({
-  id: "attempt-install-by-info",
-  instantiate: (di) => attemptInstallByInfo({
-    attemptInstall: di.inject(attemptInstallInjectable),
-    getBaseRegistryUrl: di.inject(getBaseRegistryUrlInjectable),
-    extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
-    confirm: di.inject(confirmInjectable),
-  }),
+      const fileName = getBasenameOfPath(tarballUrl);
+      const { signal } = withTimeout(10 * 60 * 1000);
+      const request = await downloadBinary(tarballUrl, { signal });
+
+      if (!request.callWasSuccessful) {
+        showErrorNotification(`Failed to download extension: ${request.error}`);
+
+        return disposer();
+      }
+
+      return attemptInstall({ fileName, data: request.response }, disposer);
+    };
+  },
 });
 
 export default attemptInstallByInfoInjectable;
diff --git a/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.ts b/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.ts
deleted file mode 100644
index 21ceb73ecf..0000000000
--- a/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
-import uninstallExtensionInjectable from "../uninstall-extension/uninstall-extension.injectable";
-import { attemptInstall } from "./attempt-install";
-import unpackExtensionInjectable from "./unpack-extension/unpack-extension.injectable";
-import getExtensionDestFolderInjectable
-  from "./get-extension-dest-folder/get-extension-dest-folder.injectable";
-import createTempFilesAndValidateInjectable from "./create-temp-files-and-validate/create-temp-files-and-validate.injectable";
-import extensionInstallationStateStoreInjectable
-  from "../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
-
-const attemptInstallInjectable = getInjectable({
-  id: "attempt-install",
-
-  instantiate: (di) =>
-    attemptInstall({
-      extensionLoader: di.inject(extensionLoaderInjectable),
-      uninstallExtension: di.inject(uninstallExtensionInjectable),
-      unpackExtension: di.inject(unpackExtensionInjectable),
-      createTempFilesAndValidate: di.inject(createTempFilesAndValidateInjectable),
-      getExtensionDestFolder: di.inject(getExtensionDestFolderInjectable),
-      extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
-    }),
-});
-
-export default attemptInstallInjectable;
diff --git a/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.tsx b/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.tsx
new file mode 100644
index 0000000000..cb73df7237
--- /dev/null
+++ b/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.tsx
@@ -0,0 +1,148 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
+import uninstallExtensionInjectable from "../uninstall-extension/uninstall-extension.injectable";
+import type { UnpackExtension } from "./unpack-extension.injectable";
+import unpackExtensionInjectable from "./unpack-extension.injectable";
+import type { GetExtensionDestFolder } from "./get-extension-dest-folder.injectable";
+import getExtensionDestFolderInjectable from "./get-extension-dest-folder.injectable";
+import type { CreateTempFilesAndValidate } from "./create-temp-files-and-validate.injectable";
+import createTempFilesAndValidateInjectable from "./create-temp-files-and-validate.injectable";
+import extensionInstallationStateStoreInjectable from "../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
+import type { Disposer } from "../../../../common/utils";
+import { disposer } from "../../../../common/utils";
+import { Notifications } from "../../notifications";
+import { Button } from "../../button";
+import type { ExtensionLoader } from "../../../../extensions/extension-loader";
+import type { LensExtensionId } from "../../../../extensions/lens-extension";
+import React from "react";
+import { remove as removeDir } from "fs-extra";
+import { shell } from "electron";
+import type { ExtensionInstallationStateStore } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store";
+import { ExtensionInstallationState } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store";
+
+export interface InstallRequest {
+  fileName: string;
+  data: Buffer;
+}
+
+interface Dependencies {
+  extensionLoader: ExtensionLoader;
+  uninstallExtension: (id: LensExtensionId) => Promise<boolean>;
+  unpackExtension: UnpackExtension;
+  createTempFilesAndValidate: CreateTempFilesAndValidate;
+  getExtensionDestFolder: GetExtensionDestFolder;
+  installStateStore: ExtensionInstallationStateStore;
+}
+
+export type AttemptInstall = (request: InstallRequest, cleanup?: Disposer) => Promise<void>;
+
+const attemptInstall = ({
+  extensionLoader,
+  uninstallExtension,
+  unpackExtension,
+  createTempFilesAndValidate,
+  getExtensionDestFolder,
+  installStateStore,
+}: Dependencies): AttemptInstall =>
+  async (request, cleanup) => {
+    const dispose = disposer(
+      installStateStore.startPreInstall(),
+      cleanup,
+    );
+
+    const validatedRequest = await createTempFilesAndValidate(request);
+
+    if (!validatedRequest) {
+      return dispose();
+    }
+
+    const { name, version, description } = validatedRequest.manifest;
+    const curState = installStateStore.getInstallationState(validatedRequest.id);
+
+    if (curState !== ExtensionInstallationState.IDLE) {
+      dispose();
+
+      return void Notifications.error(
+        <div className="flex column gaps">
+          <b>Extension Install Collision:</b>
+          <p>
+            {"The "}
+            <em>{name}</em>
+            {` extension is currently ${curState.toLowerCase()}.`}
+          </p>
+          <p>Will not proceed with this current install request.</p>
+        </div>,
+      );
+    }
+
+    const extensionFolder = getExtensionDestFolder(name);
+    const installedExtension = extensionLoader.getExtension(validatedRequest.id);
+
+    if (installedExtension) {
+      const { version: oldVersion } = installedExtension.manifest;
+
+      // confirm to uninstall old version before installing new version
+      const removeNotification = Notifications.info(
+        <div className="InstallingExtensionNotification flex gaps align-center">
+          <div className="flex column gaps">
+            <p>
+              {"Install extension "}
+              <b>{`${name}@${version}`}</b>
+              ?
+            </p>
+            <p>
+              {"Description: "}
+              <em>{description}</em>
+            </p>
+            <div
+              className="remove-folder-warning"
+              onClick={() => shell.openPath(extensionFolder)}
+            >
+              <b>Warning:</b>
+              {` ${name}@${oldVersion} will be removed before installation.`}
+            </div>
+          </div>
+          <Button
+            autoFocus
+            label="Install"
+            onClick={async () => {
+              removeNotification();
+
+              if (await uninstallExtension(validatedRequest.id)) {
+                await unpackExtension(validatedRequest, dispose);
+              } else {
+                dispose();
+              }
+            }}
+          />
+        </div>,
+        {
+          onClose: dispose,
+        },
+      );
+    } else {
+      // clean up old data if still around
+      await removeDir(extensionFolder);
+
+      // install extension if not yet exists
+      await unpackExtension(validatedRequest, dispose);
+    }
+  };
+
+const attemptInstallInjectable = getInjectable({
+  id: "attempt-install",
+  instantiate: (di) => attemptInstall({
+    extensionLoader: di.inject(extensionLoaderInjectable),
+    uninstallExtension: di.inject(uninstallExtensionInjectable),
+    unpackExtension: di.inject(unpackExtensionInjectable),
+    createTempFilesAndValidate: di.inject(createTempFilesAndValidateInjectable),
+    getExtensionDestFolder: di.inject(getExtensionDestFolderInjectable),
+    installStateStore: di.inject(extensionInstallationStateStoreInjectable),
+  }),
+});
+
+export default attemptInstallInjectable;
diff --git a/src/renderer/components/+extensions/attempt-install/attempt-install.tsx b/src/renderer/components/+extensions/attempt-install/attempt-install.tsx
deleted file mode 100644
index 9d83862357..0000000000
--- a/src/renderer/components/+extensions/attempt-install/attempt-install.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import type {
-  Disposer,
-  ExtendableDisposer } from "../../../../common/utils";
-import {
-  disposer,
-} from "../../../../common/utils";
-import { Notifications } from "../../notifications";
-import { Button } from "../../button";
-import type { ExtensionLoader } from "../../../../extensions/extension-loader";
-import type { LensExtensionId } from "../../../../extensions/lens-extension";
-import React from "react";
-import { remove as removeDir } from "fs-extra";
-import { shell } from "electron";
-import type { InstallRequestValidated } from "./create-temp-files-and-validate/create-temp-files-and-validate";
-import type { InstallRequest } from "./install-request";
-import type {
-  ExtensionInstallationStateStore } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store";
-import {
-  ExtensionInstallationState,
-} from "../../../../extensions/extension-installation-state-store/extension-installation-state-store";
-
-interface Dependencies {
-  extensionLoader: ExtensionLoader;
-  uninstallExtension: (id: LensExtensionId) => Promise<boolean>;
-
-  unpackExtension: (
-    request: InstallRequestValidated,
-    disposeDownloading: Disposer,
-  ) => Promise<void>;
-
-  createTempFilesAndValidate: (
-    installRequest: InstallRequest,
-  ) => Promise<InstallRequestValidated | null>;
-
-  getExtensionDestFolder: (name: string) => string;
-
-  extensionInstallationStateStore: ExtensionInstallationStateStore;
-}
-
-export const attemptInstall =
-  ({
-    extensionLoader,
-    uninstallExtension,
-    unpackExtension,
-    createTempFilesAndValidate,
-    getExtensionDestFolder,
-    extensionInstallationStateStore,
-  }: Dependencies) =>
-    async (request: InstallRequest, d?: ExtendableDisposer): Promise<void> => {
-      const dispose = disposer(
-        extensionInstallationStateStore.startPreInstall(),
-        d,
-      );
-
-      const validatedRequest = await createTempFilesAndValidate(request);
-
-      if (!validatedRequest) {
-        return dispose();
-      }
-
-      const { name, version, description } = validatedRequest.manifest;
-      const curState = extensionInstallationStateStore.getInstallationState(
-        validatedRequest.id,
-      );
-
-      if (curState !== ExtensionInstallationState.IDLE) {
-        dispose();
-
-        return void Notifications.error(
-          <div className="flex column gaps">
-            <b>Extension Install Collision:</b>
-            <p>
-              {"The "}
-              <em>{name}</em>
-              {` extension is currently ${curState.toLowerCase()}.`}
-            </p>
-            <p>Will not proceed with this current install request.</p>
-          </div>,
-        );
-      }
-
-      const extensionFolder = getExtensionDestFolder(name);
-      const installedExtension = extensionLoader.getExtension(validatedRequest.id);
-
-      if (installedExtension) {
-        const { version: oldVersion } = installedExtension.manifest;
-
-        // confirm to uninstall old version before installing new version
-        const removeNotification = Notifications.info(
-          <div className="InstallingExtensionNotification flex gaps align-center">
-            <div className="flex column gaps">
-              <p>
-                {"Install extension "}
-                <b>{`${name}@${version}`}</b>
-                ?
-              </p>
-              <p>
-                {"Description: "}
-                <em>{description}</em>
-              </p>
-              <div
-                className="remove-folder-warning"
-                onClick={() => shell.openPath(extensionFolder)}
-              >
-                <b>Warning:</b>
-                {` ${name}@${oldVersion} will be removed before installation.`}
-              </div>
-            </div>
-            <Button
-              autoFocus
-              label="Install"
-              onClick={async () => {
-                removeNotification();
-
-                if (await uninstallExtension(validatedRequest.id)) {
-                  await unpackExtension(validatedRequest, dispose);
-                } else {
-                  dispose();
-                }
-              }}
-            />
-          </div>,
-          {
-            onClose: dispose,
-          },
-        );
-      } else {
-        // clean up old data if still around
-        await removeDir(extensionFolder);
-
-        // install extension if not yet exists
-        await unpackExtension(validatedRequest, dispose);
-      }
-    };
diff --git a/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate.injectable.tsx b/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate.injectable.tsx
new file mode 100644
index 0000000000..e9fea96e44
--- /dev/null
+++ b/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate.injectable.tsx
@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import extensionDiscoveryInjectable from "../../../../extensions/extension-discovery/extension-discovery.injectable";
+import { validatePackage } from "./validate-package";
+import type { ExtensionDiscovery } from "../../../../extensions/extension-discovery/extension-discovery";
+import { getMessageFromError } from "../get-message-from-error/get-message-from-error";
+import logger from "../../../../main/logger";
+import { Notifications } from "../../notifications";
+import path from "path";
+import fse from "fs-extra";
+import React from "react";
+import os from "os";
+import type { LensExtensionId, LensExtensionManifest } from "../../../../extensions/lens-extension";
+import type { InstallRequest } from "./attempt-install.injectable";
+
+export interface InstallRequestValidated {
+  fileName: string;
+  data: Buffer;
+  id: LensExtensionId;
+  manifest: LensExtensionManifest;
+  tempFile: string; // temp system path to packed extension for unpacking
+}
+
+interface Dependencies {
+  extensionDiscovery: ExtensionDiscovery;
+}
+
+export type CreateTempFilesAndValidate = (request: InstallRequest) => Promise<InstallRequestValidated | null>;
+
+const createTempFilesAndValidate = ({
+  extensionDiscovery,
+}: Dependencies): CreateTempFilesAndValidate => (
+  async ({ fileName, data }) => {
+    // copy files to temp
+    await fse.ensureDir(getExtensionPackageTemp());
+
+    // validate packages
+    const tempFile = getExtensionPackageTemp(fileName);
+
+    try {
+      await fse.writeFile(tempFile, data);
+      const manifest = await validatePackage(tempFile);
+      const id = path.join(
+        extensionDiscovery.nodeModulesPath,
+        manifest.name,
+        "package.json",
+      );
+
+      return {
+        fileName,
+        data,
+        manifest,
+        tempFile,
+        id,
+      };
+    } catch (error) {
+      const message = getMessageFromError(error);
+
+      logger.info(
+        `[EXTENSION-INSTALLATION]: installing ${fileName} has failed: ${message}`,
+        { error },
+      );
+      Notifications.error((
+        <div className="flex column gaps">
+          <p>
+            {"Installing "}
+            <em>{fileName}</em>
+            {" has failed, skipping."}
+          </p>
+          <p>
+            {"Reason: "}
+            <em>{message}</em>
+          </p>
+        </div>
+      ));
+    }
+
+    return null;
+  }
+);
+
+
+function getExtensionPackageTemp(fileName = "") {
+  return path.join(os.tmpdir(), "lens-extensions", fileName);
+}
+
+const createTempFilesAndValidateInjectable = getInjectable({
+  id: "create-temp-files-and-validate",
+  instantiate: (di) => createTempFilesAndValidate({
+    extensionDiscovery: di.inject(extensionDiscoveryInjectable),
+  }),
+});
+
+export default createTempFilesAndValidateInjectable;
diff --git a/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate/create-temp-files-and-validate.injectable.tsx b/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate/create-temp-files-and-validate.injectable.tsx
deleted file mode 100644
index d0d71e6fbe..0000000000
--- a/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate/create-temp-files-and-validate.injectable.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { createTempFilesAndValidate } from "./create-temp-files-and-validate";
-import extensionDiscoveryInjectable from "../../../../../extensions/extension-discovery/extension-discovery.injectable";
-
-const createTempFilesAndValidateInjectable = getInjectable({
-  id: "create-temp-files-and-validate",
-
-  instantiate: (di) =>
-    createTempFilesAndValidate({
-      extensionDiscovery: di.inject(extensionDiscoveryInjectable),
-    }),
-});
-
-export default createTempFilesAndValidateInjectable;
diff --git a/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate/create-temp-files-and-validate.tsx b/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate/create-temp-files-and-validate.tsx
deleted file mode 100644
index b3df89ca92..0000000000
--- a/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate/create-temp-files-and-validate.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { validatePackage } from "../validate-package/validate-package";
-import type { ExtensionDiscovery } from "../../../../../extensions/extension-discovery/extension-discovery";
-import { getMessageFromError } from "../../get-message-from-error/get-message-from-error";
-import logger from "../../../../../main/logger";
-import { Notifications } from "../../../notifications";
-import path from "path";
-import fse from "fs-extra";
-import React from "react";
-import os from "os";
-import type {
-  LensExtensionId,
-  LensExtensionManifest,
-} from "../../../../../extensions/lens-extension";
-import type { InstallRequest } from "../install-request";
-
-export interface InstallRequestValidated {
-  fileName: string;
-  data: Buffer;
-  id: LensExtensionId;
-  manifest: LensExtensionManifest;
-  tempFile: string; // temp system path to packed extension for unpacking
-}
-
-interface Dependencies {
-  extensionDiscovery: ExtensionDiscovery;
-}
-
-export const createTempFilesAndValidate =
-  ({ extensionDiscovery }: Dependencies) =>
-    async ({
-      fileName,
-      dataP,
-    }: InstallRequest): Promise<InstallRequestValidated | null> => {
-      // copy files to temp
-      await fse.ensureDir(getExtensionPackageTemp());
-
-      // validate packages
-      const tempFile = getExtensionPackageTemp(fileName);
-
-      try {
-        const data = await dataP;
-
-        if (!data) {
-          return null;
-        }
-
-        await fse.writeFile(tempFile, data);
-        const manifest = await validatePackage(tempFile);
-        const id = path.join(
-          extensionDiscovery.nodeModulesPath,
-          manifest.name,
-          "package.json",
-        );
-
-        return {
-          fileName,
-          data,
-          manifest,
-          tempFile,
-          id,
-        };
-      } catch (error) {
-        const message = getMessageFromError(error);
-
-        logger.info(
-          `[EXTENSION-INSTALLATION]: installing ${fileName} has failed: ${message}`,
-          { error },
-        );
-        Notifications.error(
-          <div className="flex column gaps">
-            <p>
-              {"Installing "}
-              <em>{fileName}</em>
-              {" has failed, skipping."}
-            </p>
-            <p>
-              {"Reason: "}
-              <em>{message}</em>
-            </p>
-          </div>,
-        );
-      }
-
-      return null;
-    };
-
-
-function getExtensionPackageTemp(fileName = "") {
-  return path.join(os.tmpdir(), "lens-extensions", fileName);
-}
diff --git a/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder.injectable.ts b/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder.injectable.ts
new file mode 100644
index 0000000000..6d6dbfbef3
--- /dev/null
+++ b/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import extensionDiscoveryInjectable from "../../../../extensions/extension-discovery/extension-discovery.injectable";
+import { sanitizeExtensionName } from "../../../../extensions/lens-extension";
+import path from "path";
+
+export type GetExtensionDestFolder = (name: string) => string;
+
+const getExtensionDestFolderInjectable = getInjectable({
+  id: "get-extension-dest-folder",
+
+  instantiate: (di): GetExtensionDestFolder => {
+    const extensionDiscovery = di.inject(extensionDiscoveryInjectable);
+
+    return (name) => path.join(extensionDiscovery.localFolderPath, sanitizeExtensionName(name));
+  },
+});
+
+export default getExtensionDestFolderInjectable;
diff --git a/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder/get-extension-dest-folder.injectable.ts b/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder/get-extension-dest-folder.injectable.ts
deleted file mode 100644
index 3062439e1b..0000000000
--- a/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder/get-extension-dest-folder.injectable.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-
-import extensionDiscoveryInjectable from "../../../../../extensions/extension-discovery/extension-discovery.injectable";
-
-import { getExtensionDestFolder } from "./get-extension-dest-folder";
-
-const getExtensionDestFolderInjectable = getInjectable({
-  id: "get-extension-dest-folder",
-
-  instantiate: (di) =>
-    getExtensionDestFolder({
-      extensionDiscovery: di.inject(extensionDiscoveryInjectable),
-    }),
-});
-
-export default getExtensionDestFolderInjectable;
diff --git a/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder/get-extension-dest-folder.ts b/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder/get-extension-dest-folder.ts
deleted file mode 100644
index 52e06d2cca..0000000000
--- a/src/renderer/components/+extensions/attempt-install/get-extension-dest-folder/get-extension-dest-folder.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import type { ExtensionDiscovery } from "../../../../../extensions/extension-discovery/extension-discovery";
-import { sanitizeExtensionName } from "../../../../../extensions/lens-extension";
-import path from "path";
-
-interface Dependencies {
-  extensionDiscovery: ExtensionDiscovery;
-}
-
-export const getExtensionDestFolder =
-  ({ extensionDiscovery }: Dependencies) =>
-    (name: string) =>
-      path.join(extensionDiscovery.localFolderPath, sanitizeExtensionName(name));
diff --git a/src/renderer/components/+extensions/attempt-install/install-request.ts b/src/renderer/components/+extensions/attempt-install/install-request.ts
deleted file mode 100644
index c5af4e5f93..0000000000
--- a/src/renderer/components/+extensions/attempt-install/install-request.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-export interface InstallRequest {
-  fileName: string;
-  dataP: Promise<Buffer | null>;
-}
diff --git a/src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.tsx b/src/renderer/components/+extensions/attempt-install/unpack-extension.injectable.tsx
similarity index 55%
rename from src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.tsx
rename to src/renderer/components/+extensions/attempt-install/unpack-extension.injectable.tsx
index 44b02f6351..c81a69f9b0 100644
--- a/src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.tsx
+++ b/src/renderer/components/+extensions/attempt-install/unpack-extension.injectable.tsx
@@ -2,33 +2,38 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { InstallRequestValidated } from "../create-temp-files-and-validate/create-temp-files-and-validate";
-import type { Disposer } from "../../../../../common/utils";
-import { extractTar, noop } from "../../../../../common/utils";
-import { extensionDisplayName } from "../../../../../extensions/lens-extension";
-import logger from "../../../../../main/logger";
-import type { ExtensionLoader } from "../../../../../extensions/extension-loader";
-import { Notifications } from "../../../notifications";
-import { getMessageFromError } from "../../get-message-from-error/get-message-from-error";
+import { getInjectable } from "@ogre-tools/injectable";
+import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
+import getExtensionDestFolderInjectable from "./get-extension-dest-folder.injectable";
+import extensionInstallationStateStoreInjectable from "../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
+import type { Disposer } from "../../../../common/utils";
+import { noop } from "../../../../common/utils";
+import { extensionDisplayName } from "../../../../extensions/lens-extension";
+import { getMessageFromError } from "../get-message-from-error/get-message-from-error";
 import path from "path";
 import fse from "fs-extra";
 import { when } from "mobx";
 import React from "react";
-import type { ExtensionInstallationStateStore } from "../../../../../extensions/extension-installation-state-store/extension-installation-state-store";
+import type { InstallRequestValidated } from "./create-temp-files-and-validate.injectable";
+import extractTarInjectable from "../../../../common/fs/extract-tar.injectable";
+import loggerInjectable from "../../../../common/logger.injectable";
+import showInfoNotificationInjectable from "../../notifications/show-info-notification.injectable";
+import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable";
 
-interface Dependencies {
-  extensionLoader: ExtensionLoader;
-  getExtensionDestFolder: (name: string) => string;
-  extensionInstallationStateStore: ExtensionInstallationStateStore;
-}
+export type UnpackExtension = (request: InstallRequestValidated, disposeDownloading?: Disposer) => Promise<void>;
 
-export const unpackExtension =
-  ({
-    extensionLoader,
-    getExtensionDestFolder,
-    extensionInstallationStateStore,
-  }: Dependencies) =>
-    async (request: InstallRequestValidated, disposeDownloading?: Disposer) => {
+const unpackExtensionInjectable = getInjectable({
+  id: "unpack-extension",
+  instantiate: (di): UnpackExtension => {
+    const extensionLoader = di.inject(extensionLoaderInjectable);
+    const getExtensionDestFolder = di.inject(getExtensionDestFolderInjectable);
+    const extensionInstallationStateStore = di.inject(extensionInstallationStateStoreInjectable);
+    const extractTar = di.inject(extractTarInjectable);
+    const logger = di.inject(loggerInjectable);
+    const showInfoNotification = di.inject(showInfoNotificationInjectable);
+    const showErrorNotification = di.inject(showErrorNotificationInjectable);
+
+    return async (request, disposeDownloading) => {
       const {
         id,
         fileName,
@@ -73,13 +78,13 @@ export const unpackExtension =
         // Enable installed extensions by default.
         extensionLoader.setIsEnabled(id, true);
 
-        Notifications.ok(
+        showInfoNotification((
           <p>
             {"Extension "}
             <b>{displayName}</b>
             {" successfully installed!"}
-          </p>,
-        );
+          </p>
+        ));
       } catch (error) {
         const message = getMessageFromError(error);
 
@@ -87,14 +92,14 @@ export const unpackExtension =
           `[EXTENSION-INSTALLATION]: installing ${request.fileName} has failed: ${message}`,
           { error },
         );
-        Notifications.error(
+        showErrorNotification((
           <p>
             {"Installing extension "}
             <b>{displayName}</b>
             {" has failed: "}
             <em>{message}</em>
-          </p>,
-        );
+          </p>
+        ));
       } finally {
       // Remove install state once finished
         extensionInstallationStateStore.clearInstalling(id);
@@ -104,3 +109,7 @@ export const unpackExtension =
         fse.unlink(tempFile).catch(noop);
       }
     };
+  },
+});
+
+export default unpackExtensionInjectable;
diff --git a/src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.injectable.tsx b/src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.injectable.tsx
deleted file mode 100644
index ebbc3639c5..0000000000
--- a/src/renderer/components/+extensions/attempt-install/unpack-extension/unpack-extension.injectable.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { unpackExtension } from "./unpack-extension";
-import extensionLoaderInjectable from "../../../../../extensions/extension-loader/extension-loader.injectable";
-import getExtensionDestFolderInjectable
-  from "../get-extension-dest-folder/get-extension-dest-folder.injectable";
-import extensionInstallationStateStoreInjectable
-  from "../../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
-
-const unpackExtensionInjectable = getInjectable({
-  id: "unpack-extension",
-
-  instantiate: (di) =>
-    unpackExtension({
-      extensionLoader: di.inject(extensionLoaderInjectable),
-      getExtensionDestFolder: di.inject(getExtensionDestFolderInjectable),
-      extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
-    }),
-});
-
-export default unpackExtensionInjectable;
diff --git a/src/renderer/components/+extensions/attempt-install/validate-package/validate-package.tsx b/src/renderer/components/+extensions/attempt-install/validate-package.tsx
similarity index 69%
rename from src/renderer/components/+extensions/attempt-install/validate-package/validate-package.tsx
rename to src/renderer/components/+extensions/attempt-install/validate-package.tsx
index ad3432574b..e9597b2d10 100644
--- a/src/renderer/components/+extensions/attempt-install/validate-package/validate-package.tsx
+++ b/src/renderer/components/+extensions/attempt-install/validate-package.tsx
@@ -2,27 +2,23 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { LensExtensionManifest } from "../../../../../extensions/lens-extension";
-import { hasTypedProperty, isObject, isString, listTarEntries, readFileFromTar } from "../../../../../common/utils";
-import { manifestFilename } from "../../../../../extensions/extension-discovery/extension-discovery";
+import type { LensExtensionManifest } from "../../../../extensions/lens-extension";
+import { hasTypedProperty, isObject, isString, listTarEntries, readFileFromTar } from "../../../../common/utils";
+import { manifestFilename } from "../../../../extensions/extension-discovery/extension-discovery";
 import path from "path";
 
-export const validatePackage = async (
-  filePath: string,
-): Promise<LensExtensionManifest> => {
+export async function validatePackage(filePath: string): Promise<LensExtensionManifest> {
   const tarFiles = await listTarEntries(filePath);
 
   // tarball from npm contains single root folder "package/*"
   const firstFile = tarFiles[0];
 
   if (!firstFile) {
-    throw new Error(`invalid extension bundle,  ${manifestFilename} not found`);
+    throw new Error(`invalid extension bundle, ${manifestFilename} not found`);
   }
 
   const rootFolder = path.normalize(firstFile).split(path.sep)[0];
-  const packedInRootFolder = tarFiles.every(entry =>
-    entry.startsWith(rootFolder),
-  );
+  const packedInRootFolder = tarFiles.every(entry => entry.startsWith(rootFolder));
   const manifestLocation = packedInRootFolder
     ? path.join(rootFolder, manifestFilename)
     : manifestFilename;
@@ -48,4 +44,4 @@ export const validatePackage = async (
   }
 
   throw new Error(`${manifestFilename} must specify "main" and/or "renderer" fields`);
-};
+}
diff --git a/src/renderer/components/+extensions/attempt-installs.injectable.ts b/src/renderer/components/+extensions/attempt-installs.injectable.ts
new file mode 100644
index 0000000000..8f2a066492
--- /dev/null
+++ b/src/renderer/components/+extensions/attempt-installs.injectable.ts
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import attemptInstallInjectable from "./attempt-install/attempt-install.injectable";
+import path from "path";
+import readFileNotifyInjectable from "./read-file-notify/read-file-notify.injectable";
+
+export type AttemptInstalls = (filePaths: string[]) => Promise<void>;
+
+const attemptInstallsInjectable = getInjectable({
+  id: "attempt-installs",
+
+  instantiate: (di): AttemptInstalls => {
+    const attemptInstall = di.inject(attemptInstallInjectable);
+    const readFileNotify = di.inject(readFileNotifyInjectable);
+
+    return async (filePaths) => {
+      await Promise.allSettled(
+        filePaths.map(async filePath => {
+          const data = await readFileNotify(filePath);
+
+          if (!data) {
+            return;
+          }
+
+          return attemptInstall({
+            fileName: path.basename(filePath),
+            data,
+          });
+        }),
+      );
+    };
+  },
+});
+
+export default attemptInstallsInjectable;
diff --git a/src/renderer/components/+extensions/attempt-installs/attempt-installs.injectable.ts b/src/renderer/components/+extensions/attempt-installs/attempt-installs.injectable.ts
deleted file mode 100644
index 407668989f..0000000000
--- a/src/renderer/components/+extensions/attempt-installs/attempt-installs.injectable.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { attemptInstalls } from "./attempt-installs";
-import attemptInstallInjectable from "../attempt-install/attempt-install.injectable";
-
-const attemptInstallsInjectable = getInjectable({
-  id: "attempt-installs",
-
-  instantiate: (di) =>
-    attemptInstalls({
-      attemptInstall: di.inject(attemptInstallInjectable),
-    }),
-});
-
-export default attemptInstallsInjectable;
diff --git a/src/renderer/components/+extensions/attempt-installs/attempt-installs.ts b/src/renderer/components/+extensions/attempt-installs/attempt-installs.ts
deleted file mode 100644
index c40d9e78ca..0000000000
--- a/src/renderer/components/+extensions/attempt-installs/attempt-installs.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { readFileNotify } from "../read-file-notify/read-file-notify";
-import path from "path";
-import type { InstallRequest } from "../attempt-install/install-request";
-
-interface Dependencies {
-  attemptInstall: (request: InstallRequest) => Promise<void>;
-}
-
-export const attemptInstalls =
-  ({ attemptInstall }: Dependencies) =>
-    async (filePaths: string[]): Promise<void> => {
-      const promises: Promise<void>[] = [];
-
-      for (const filePath of filePaths) {
-        promises.push(
-          attemptInstall({
-            fileName: path.basename(filePath),
-            dataP: readFileNotify(filePath),
-          }),
-        );
-      }
-
-      await Promise.allSettled(promises);
-    };
diff --git a/src/renderer/components/+extensions/extensions.tsx b/src/renderer/components/+extensions/extensions.tsx
index 446f6e0778..b9dfdb791b 100644
--- a/src/renderer/components/+extensions/extensions.tsx
+++ b/src/renderer/components/+extensions/extensions.tsx
@@ -28,23 +28,24 @@ import enableExtensionInjectable from "./enable-extension/enable-extension.injec
 import disableExtensionInjectable from "./disable-extension/disable-extension.injectable";
 import type { ConfirmUninstallExtension } from "./confirm-uninstall-extension.injectable";
 import confirmUninstallExtensionInjectable from "./confirm-uninstall-extension.injectable";
-import installFromInputInjectable from "./install-from-input/install-from-input.injectable";
+import type { InstallExtensionFromInput } from "./install-extension-from-input.injectable";
+import installExtensionFromInputInjectable from "./install-extension-from-input.injectable";
 import installFromSelectFileDialogInjectable from "./install-from-select-file-dialog.injectable";
 import type { LensExtensionId } from "../../../extensions/lens-extension";
-import installOnDropInjectable from "./install-on-drop/install-on-drop.injectable";
+import type { InstallOnDrop } from "./install-on-drop.injectable";
+import installOnDropInjectable from "./install-on-drop.injectable";
 import { supportedExtensionFormats } from "./supported-extension-formats";
 import extensionInstallationStateStoreInjectable from "../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
 import type { ExtensionInstallationStateStore } from "../../../extensions/extension-installation-state-store/extension-installation-state-store";
-import type { InstallFromInput } from "./install-from-input/install-from-input";
 
 interface Dependencies {
   userExtensions: IComputedValue<InstalledExtension[]>;
   enableExtension: (id: LensExtensionId) => void;
   disableExtension: (id: LensExtensionId) => void;
   confirmUninstallExtension: ConfirmUninstallExtension;
-  installFromInput: InstallFromInput;
+  installExtensionFromInput: InstallExtensionFromInput;
   installFromSelectFileDialog: () => Promise<void>;
-  installOnDrop: (files: File[]) => Promise<void>;
+  installOnDrop: InstallOnDrop;
   extensionInstallationStateStore: ExtensionInstallationStateStore;
 }
 
@@ -107,7 +108,7 @@ class NonInjectedExtensions extends React.Component<Dependencies> {
             <Install
               supportedFormats={supportedExtensionFormats}
               onChange={value => (this.installPath = value)}
-              installFromInput={() => this.props.installFromInput(this.installPath)}
+              installFromInput={() => this.props.installExtensionFromInput(this.installPath)}
               installFromSelectFileDialog={this.props.installFromSelectFileDialog}
               installPath={this.installPath}
             />
@@ -131,7 +132,7 @@ export const Extensions = withInjectables<Dependencies>(NonInjectedExtensions, {
     enableExtension: di.inject(enableExtensionInjectable),
     disableExtension: di.inject(disableExtensionInjectable),
     confirmUninstallExtension: di.inject(confirmUninstallExtensionInjectable),
-    installFromInput: di.inject(installFromInputInjectable),
+    installExtensionFromInput: di.inject(installExtensionFromInputInjectable),
     installOnDrop: di.inject(installOnDropInjectable),
     installFromSelectFileDialog: di.inject(installFromSelectFileDialogInjectable),
     extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
diff --git a/src/renderer/components/+extensions/install-extension-from-input.injectable.tsx b/src/renderer/components/+extensions/install-extension-from-input.injectable.tsx
new file mode 100644
index 0000000000..3f9e5b0949
--- /dev/null
+++ b/src/renderer/components/+extensions/install-extension-from-input.injectable.tsx
@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import type { ExtendableDisposer } from "../../../common/utils";
+import { InputValidators } from "../input";
+import { getMessageFromError } from "./get-message-from-error/get-message-from-error";
+import { getInjectable } from "@ogre-tools/injectable";
+import attemptInstallInjectable from "./attempt-install/attempt-install.injectable";
+import attemptInstallByInfoInjectable from "./attempt-install-by-info.injectable";
+import extensionInstallationStateStoreInjectable from "../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
+import readFileNotifyInjectable from "./read-file-notify/read-file-notify.injectable";
+import getBasenameOfPathInjectable from "../../../common/path/get-basename.injectable";
+import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
+import downloadBinaryInjectable from "../../../common/fetch/download-binary.injectable";
+import { withTimeout } from "../../../common/fetch/timeout-controller";
+
+export type InstallExtensionFromInput = (input: string) => Promise<void>;
+
+const installExtensionFromInputInjectable = getInjectable({
+  id: "install-extension-from-input",
+
+  instantiate: (di): InstallExtensionFromInput => {
+    const attemptInstall = di.inject(attemptInstallInjectable);
+    const attemptInstallByInfo = di.inject(attemptInstallByInfoInjectable);
+    const extensionInstallationStateStore = di.inject(extensionInstallationStateStoreInjectable);
+    const readFileNotify = di.inject(readFileNotifyInjectable);
+    const getBasenameOfPath = di.inject(getBasenameOfPathInjectable);
+    const showErrorNotification = di.inject(showErrorNotificationInjectable);
+    const logger = di.inject(loggerInjectable);
+    const downloadBinary = di.inject(downloadBinaryInjectable);
+
+    return async (input) => {
+      let disposer: ExtendableDisposer | undefined = undefined;
+
+      try {
+        // fixme: improve error messages for non-tar-file URLs
+        if (InputValidators.isUrl.validate(input)) {
+          // install via url
+          disposer = extensionInstallationStateStore.startPreInstall();
+          const { signal } = withTimeout(10 * 60 * 1000);
+          const result = await downloadBinary(input, { signal });
+
+          if (!result.callWasSuccessful) {
+            showErrorNotification(`Failed to download extension: ${result.error}`);
+
+            return disposer();
+          }
+
+          const fileName = getBasenameOfPath(input);
+
+          return await attemptInstall({ fileName, data: result.response }, disposer);
+        }
+
+        try {
+          await InputValidators.isPath.validate(input);
+
+          // install from system path
+          const fileName = getBasenameOfPath(input);
+          const data = await readFileNotify(input);
+
+          if (!data) {
+            return;
+          }
+
+          return await attemptInstall({ fileName, data });
+        } catch (error) {
+          const extNameCaptures = InputValidators.isExtensionNameInstallRegex.captures(input);
+
+          if (extNameCaptures) {
+            const { name, version } = extNameCaptures;
+
+            return await attemptInstallByInfo({ name, version });
+          }
+        }
+
+        throw new Error(`Unknown format of input: ${input}`);
+      } catch (error) {
+        const message = getMessageFromError(error);
+
+        logger.info(`[EXTENSION-INSTALL]: installation has failed: ${message}`, { error, installPath: input });
+        showErrorNotification((
+          <p>
+            {"Installation has failed: "}
+            <b>{message}</b>
+          </p>
+        ));
+      } finally {
+        disposer?.();
+      }
+    };
+  },
+});
+
+export default installExtensionFromInputInjectable;
diff --git a/src/renderer/components/+extensions/install-from-input/install-from-input.injectable.ts b/src/renderer/components/+extensions/install-from-input/install-from-input.injectable.ts
deleted file mode 100644
index 1f1a073293..0000000000
--- a/src/renderer/components/+extensions/install-from-input/install-from-input.injectable.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import attemptInstallInjectable from "../attempt-install/attempt-install.injectable";
-import { installFromInput } from "./install-from-input";
-import attemptInstallByInfoInjectable from "../attempt-install-by-info.injectable";
-import extensionInstallationStateStoreInjectable
-  from "../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
-
-const installFromInputInjectable = getInjectable({
-  id: "install-extension-from-input",
-
-  instantiate: (di) =>
-    installFromInput({
-      attemptInstall: di.inject(attemptInstallInjectable),
-      attemptInstallByInfo: di.inject(attemptInstallByInfoInjectable),
-      extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
-    }),
-});
-
-export default installFromInputInjectable;
diff --git a/src/renderer/components/+extensions/install-from-input/install-from-input.tsx b/src/renderer/components/+extensions/install-from-input/install-from-input.tsx
deleted file mode 100644
index eb5d6febe4..0000000000
--- a/src/renderer/components/+extensions/install-from-input/install-from-input.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import type { ExtendableDisposer } from "../../../../common/utils";
-import { downloadFile } from "../../../../common/utils";
-import { InputValidators } from "../../input";
-import { getMessageFromError } from "../get-message-from-error/get-message-from-error";
-import logger from "../../../../main/logger";
-import { Notifications } from "../../notifications";
-import path from "path";
-import React from "react";
-import { readFileNotify } from "../read-file-notify/read-file-notify";
-import type { InstallRequest } from "../attempt-install/install-request";
-import type { ExtensionInfo } from "../attempt-install-by-info.injectable";
-import type { ExtensionInstallationStateStore } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store";
-
-export type InstallFromInput = (input: string) => Promise<void>;
-
-interface Dependencies {
-  attemptInstall: (request: InstallRequest, disposer?: ExtendableDisposer) => Promise<void>;
-  attemptInstallByInfo: (extensionInfo: ExtensionInfo) => Promise<void>;
-  extensionInstallationStateStore: ExtensionInstallationStateStore;
-}
-
-export const installFromInput = ({
-  attemptInstall,
-  attemptInstallByInfo,
-  extensionInstallationStateStore,
-}: Dependencies): InstallFromInput => (
-  async (input) => {
-    let disposer: ExtendableDisposer | undefined = undefined;
-
-    try {
-      // fixme: improve error messages for non-tar-file URLs
-      if (InputValidators.isUrl.validate(input)) {
-        // install via url
-        disposer = extensionInstallationStateStore.startPreInstall();
-        const { promise } = downloadFile({ url: input, timeout: 10 * 60 * 1000 });
-        const fileName = path.basename(input);
-
-        return await attemptInstall({ fileName, dataP: promise }, disposer);
-      }
-
-      try {
-        await InputValidators.isPath.validate(input);
-
-        // install from system path
-        const fileName = path.basename(input);
-
-        return await attemptInstall({ fileName, dataP: readFileNotify(input) });
-      } catch (error) {
-        const extNameCaptures = InputValidators.isExtensionNameInstallRegex.captures(input);
-
-        if (extNameCaptures) {
-          const { name, version } = extNameCaptures;
-
-          return await attemptInstallByInfo({ name, version });
-        }
-      }
-
-      throw new Error(`Unknown format of input: ${input}`);
-    } catch (error) {
-      const message = getMessageFromError(error);
-
-      logger.info(`[EXTENSION-INSTALL]: installation has failed: ${message}`, { error, installPath: input });
-      Notifications.error((
-        <p>
-          {"Installation has failed: "}
-          <b>{message}</b>
-        </p>
-      ));
-    } finally {
-      disposer?.();
-    }
-  }
-);
diff --git a/src/renderer/components/+extensions/install-from-select-file-dialog.injectable.ts b/src/renderer/components/+extensions/install-from-select-file-dialog.injectable.ts
index 1ae77d664a..ae9dddc299 100644
--- a/src/renderer/components/+extensions/install-from-select-file-dialog.injectable.ts
+++ b/src/renderer/components/+extensions/install-from-select-file-dialog.injectable.ts
@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { requestOpenFilePickingDialog } from "../../ipc";
 import { supportedExtensionFormats } from "./supported-extension-formats";
-import attemptInstallsInjectable from "./attempt-installs/attempt-installs.injectable";
+import attemptInstallsInjectable from "./attempt-installs.injectable";
 import directoryForDownloadsInjectable from "../../../common/app-paths/directory-for-downloads/directory-for-downloads.injectable";
 
 interface Dependencies {
diff --git a/src/renderer/components/+extensions/install-on-drop.injectable.ts b/src/renderer/components/+extensions/install-on-drop.injectable.ts
new file mode 100644
index 0000000000..e1779eb223
--- /dev/null
+++ b/src/renderer/components/+extensions/install-on-drop.injectable.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import loggerInjectable from "../../../common/logger.injectable";
+import attemptInstallsInjectable from "./attempt-installs.injectable";
+
+export type InstallOnDrop = (files: File[]) => Promise<void>;
+
+const installOnDropInjectable = getInjectable({
+  id: "install-on-drop",
+
+  instantiate: (di): InstallOnDrop => {
+    const attemptInstalls = di.inject(attemptInstallsInjectable);
+    const logger = di.inject(loggerInjectable);
+
+    return (files) => {
+      logger.info("Install from D&D");
+
+      return attemptInstalls(files.map(({ path }) => path));
+    };
+  },
+});
+
+export default installOnDropInjectable;
diff --git a/src/renderer/components/+extensions/install-on-drop/install-on-drop.injectable.ts b/src/renderer/components/+extensions/install-on-drop/install-on-drop.injectable.ts
deleted file mode 100644
index 1a693fa7a6..0000000000
--- a/src/renderer/components/+extensions/install-on-drop/install-on-drop.injectable.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { installOnDrop } from "./install-on-drop";
-import attemptInstallsInjectable from "../attempt-installs/attempt-installs.injectable";
-
-const installOnDropInjectable = getInjectable({
-  id: "install-on-drop",
-
-  instantiate: (di) =>
-    installOnDrop({
-      attemptInstalls: di.inject(attemptInstallsInjectable),
-    }),
-});
-
-export default installOnDropInjectable;
diff --git a/src/renderer/components/+extensions/install-on-drop/install-on-drop.tsx b/src/renderer/components/+extensions/install-on-drop/install-on-drop.tsx
deleted file mode 100644
index 0a887f7c6f..0000000000
--- a/src/renderer/components/+extensions/install-on-drop/install-on-drop.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import logger from "../../../../main/logger";
-
-interface Dependencies {
-  attemptInstalls: (filePaths: string[]) => Promise<void>;
-}
-
-export const installOnDrop =
-  ({ attemptInstalls }: Dependencies) =>
-    async (files: File[]) => {
-      logger.info("Install from D&D");
-      await attemptInstalls(files.map(({ path }) => path));
-    };
diff --git a/src/renderer/components/+extensions/install.tsx b/src/renderer/components/+extensions/install.tsx
index b3d33dc7dd..607ed74aaa 100644
--- a/src/renderer/components/+extensions/install.tsx
+++ b/src/renderer/components/+extensions/install.tsx
@@ -56,9 +56,7 @@ const NonInjectedInstall: React.FC<Dependencies & InstallProps> = ({
       <div>
         <Input
           theme="round-black"
-          disabled={
-            extensionInstallationStateStore.anyPreInstallingOrInstalling
-          }
+          disabled={extensionInstallationStateStore.anyPreInstallingOrInstalling}
           placeholder={"Name or file path or URL"}
           showErrorsAsTooltip={{ preferredPositions: TooltipPosition.BOTTOM }}
           validators={installPath ? installInputValidator : undefined}
diff --git a/src/renderer/components/+extensions/read-file-notify/read-file-notify.injectable.ts b/src/renderer/components/+extensions/read-file-notify/read-file-notify.injectable.ts
new file mode 100644
index 0000000000..d907314b33
--- /dev/null
+++ b/src/renderer/components/+extensions/read-file-notify/read-file-notify.injectable.ts
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getMessageFromError } from "../get-message-from-error/get-message-from-error";
+import { getInjectable } from "@ogre-tools/injectable";
+import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable";
+import loggerInjectable from "../../../../common/logger.injectable";
+import readFileBufferInjectable from "../../../../common/fs/read-file-buffer.injectable";
+
+export type ReadFileNotify = (filePath: string, showError?: boolean) => Promise<Buffer | null>;
+
+const readFileNotifyInjectable = getInjectable({
+  id: "read-file-notify",
+  instantiate: (di): ReadFileNotify => {
+    const showErrorNotification = di.inject(showErrorNotificationInjectable);
+    const logger = di.inject(loggerInjectable);
+    const readFileBuffer = di.inject(readFileBufferInjectable);
+
+    return async (filePath, showError = true) => {
+      try {
+        return await readFileBuffer(filePath);
+      } catch (error) {
+        if (showError) {
+          const message = getMessageFromError(error);
+
+          logger.info(`[EXTENSION-INSTALL]: preloading ${filePath} has failed: ${message}`, { error });
+          showErrorNotification(`Error while reading "${filePath}": ${message}`);
+        }
+      }
+
+      return null;
+    };
+  },
+});
+
+export default readFileNotifyInjectable;
+
diff --git a/src/renderer/components/+extensions/read-file-notify/read-file-notify.ts b/src/renderer/components/+extensions/read-file-notify/read-file-notify.ts
deleted file mode 100644
index 1467f1bc33..0000000000
--- a/src/renderer/components/+extensions/read-file-notify/read-file-notify.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import fse from "fs-extra";
-import { getMessageFromError } from "../get-message-from-error/get-message-from-error";
-import logger from "../../../../main/logger";
-import { Notifications } from "../../notifications";
-
-export const readFileNotify = async (filePath: string, showError = true): Promise<Buffer | null> => {
-  try {
-    return await fse.readFile(filePath);
-  } catch (error) {
-    if (showError) {
-      const message = getMessageFromError(error);
-
-      logger.info(`[EXTENSION-INSTALL]: preloading ${filePath} has failed: ${message}`, { error });
-      Notifications.error(`Error while reading "${filePath}": ${message}`);
-    }
-  }
-
-  return null;
-};
diff --git a/src/renderer/components/+helm-charts/details/readme-of-selected-helm-chart.injectable.ts b/src/renderer/components/+helm-charts/details/readme-of-selected-helm-chart.injectable.ts
index 21e8bcf7a9..839493bed3 100644
--- a/src/renderer/components/+helm-charts/details/readme-of-selected-helm-chart.injectable.ts
+++ b/src/renderer/components/+helm-charts/details/readme-of-selected-helm-chart.injectable.ts
@@ -4,30 +4,37 @@
  */
 import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
 import { asyncComputed } from "@ogre-tools/injectable-react";
-import callForHelmChartReadmeInjectable from "./readme/call-for-helm-chart-readme.injectable";
 import helmChartDetailsVersionSelectionInjectable from "./versions/helm-chart-details-version-selection.injectable";
 import type { HelmChart } from "../../../../common/k8s-api/endpoints/helm-charts.api";
+import requestHelmChartReadmeInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable";
 
 const readmeOfSelectedHelmChartInjectable = getInjectable({
   id: "readme-of-selected-helm-chart",
 
   instantiate: (di, chart: HelmChart) => {
-    const selection = di.inject(helmChartDetailsVersionSelectionInjectable, chart);
-    const callForHelmChartReadme = di.inject(callForHelmChartReadmeInjectable);
+    const selection = di.inject(
+      helmChartDetailsVersionSelectionInjectable,
+      chart,
+    );
+    const requestHelmChartReadme = di.inject(requestHelmChartReadmeInjectable);
 
-    return asyncComputed(async () => {
-      const chartVersion = selection.value.get();
+    return asyncComputed({
+      getValueFromObservedPromise: async () => {
+        const chartVersion = selection.value.get();
 
-      if (!chartVersion) {
-        return "";
-      }
+        if (!chartVersion) {
+          return "";
+        }
 
-      return await callForHelmChartReadme(
-        chartVersion.getRepository(),
-        chartVersion.getName(),
-        chartVersion.getVersion(),
-      );
-    }, "");
+        return await requestHelmChartReadme(
+          chartVersion.getRepository(),
+          chartVersion.getName(),
+          chartVersion.getVersion(),
+        );
+      },
+
+      valueWhenPending: "",
+    });
   },
 
   lifecycle: lifecycleEnum.keyedSingleton({
diff --git a/src/renderer/components/+helm-charts/details/readme/call-for-helm-chart-readme.injectable.ts b/src/renderer/components/+helm-charts/details/readme/call-for-helm-chart-readme.injectable.ts
deleted file mode 100644
index ae9c99edeb..0000000000
--- a/src/renderer/components/+helm-charts/details/readme/call-for-helm-chart-readme.injectable.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { getChartDetails } from "../../../../../common/k8s-api/endpoints/helm-charts.api";
-
-export type CallForHelmChartReadme = (
-  repo: string,
-  name: string,
-  version: string,
-) => Promise<string>;
-
-const callForHelmChartReadmeInjectable = getInjectable({
-  id: "call-for-helm-chart-readme",
-
-  instantiate:
-    (): CallForHelmChartReadme =>
-      async (repository: string, name: string, version: string) => {
-        // TODO: Dismantle wrong abstraction
-        const details = await getChartDetails(repository, name, { version });
-
-        return details.readme;
-      },
-
-  causesSideEffects: true,
-});
-
-export default callForHelmChartReadmeInjectable;
diff --git a/src/renderer/components/+helm-charts/details/versions-of-selected-helm-chart.injectable.ts b/src/renderer/components/+helm-charts/details/versions-of-selected-helm-chart.injectable.ts
index 14ea00fce2..ad7ca9b983 100644
--- a/src/renderer/components/+helm-charts/details/versions-of-selected-helm-chart.injectable.ts
+++ b/src/renderer/components/+helm-charts/details/versions-of-selected-helm-chart.injectable.ts
@@ -4,20 +4,23 @@
  */
 import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
 import { asyncComputed } from "@ogre-tools/injectable-react";
-import callForHelmChartVersionsInjectable from "./versions/call-for-helm-chart-versions.injectable";
 import type { HelmChart } from "../../../../common/k8s-api/endpoints/helm-charts.api";
+import requestHelmChartVersionsInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable";
 
 const versionsOfSelectedHelmChartInjectable = getInjectable({
   id: "versions-of-selected-helm-chart",
 
   instantiate: (di, chart: HelmChart) => {
-    const callForHelmChartVersions = di.inject(callForHelmChartVersionsInjectable);
-
-    return asyncComputed(
-      async () =>
-        await callForHelmChartVersions(chart.getRepository(), chart.getName()),
-      [],
+    const requestHelmChartVersions = di.inject(
+      requestHelmChartVersionsInjectable,
     );
+
+    return asyncComputed({
+      getValueFromObservedPromise: async () =>
+        await requestHelmChartVersions(chart.getRepository(), chart.getName()),
+
+      valueWhenPending: [],
+    });
   },
 
   lifecycle: lifecycleEnum.keyedSingleton({
diff --git a/src/renderer/components/+helm-charts/details/versions/call-for-helm-chart-versions.injectable.ts b/src/renderer/components/+helm-charts/details/versions/call-for-helm-chart-versions.injectable.ts
deleted file mode 100644
index a20f5b60e9..0000000000
--- a/src/renderer/components/+helm-charts/details/versions/call-for-helm-chart-versions.injectable.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { HelmChart } from "../../../../../common/k8s-api/endpoints/helm-charts.api";
-import { getChartDetails } from "../../../../../common/k8s-api/endpoints/helm-charts.api";
-
-export type CallForHelmChartVersions = (
-  repo: string,
-  name: string
-) => Promise<HelmChart[]>;
-
-const callForHelmChartVersionsInjectable = getInjectable({
-  id: "call-for-helm-chart-versions",
-
-  instantiate:
-    (): CallForHelmChartVersions => async (repository: string, name: string) => {
-    // TODO: Dismantle wrong abstraction
-      const details = await getChartDetails(repository, name);
-
-      return details.versions;
-    },
-
-  causesSideEffects: true,
-});
-
-export default callForHelmChartVersionsInjectable;
diff --git a/src/renderer/components/+helm-charts/get-char-details.injectable.ts b/src/renderer/components/+helm-charts/get-char-details.injectable.ts
deleted file mode 100644
index e2c5ccca62..0000000000
--- a/src/renderer/components/+helm-charts/get-char-details.injectable.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { GetChartDetailsOptions, IHelmChartDetails } from "../../../common/k8s-api/endpoints/helm-charts.api";
-import { getChartDetails } from "../../../common/k8s-api/endpoints/helm-charts.api";
-
-export type GetChartDetails = (repo: string, name: string, opts?: GetChartDetailsOptions) => Promise<IHelmChartDetails>;
-
-const getChartDetailsInjectable = getInjectable({
-  id: "get-chart-details",
-  instantiate: (): GetChartDetails => getChartDetails,
-  causesSideEffects: true,
-});
-
-export default getChartDetailsInjectable;
diff --git a/src/renderer/components/+helm-charts/helm-chart-details.tsx b/src/renderer/components/+helm-charts/helm-chart-details.tsx
index d15552dedb..cf2b781e66 100644
--- a/src/renderer/components/+helm-charts/helm-chart-details.tsx
+++ b/src/renderer/components/+helm-charts/helm-chart-details.tsx
@@ -117,16 +117,10 @@ class NonInjectedHelmChartDetails extends Component<HelmChartDetailsProps & Depe
             </a>
           </DrawerItem>
           <DrawerItem name="Maintainers" className="maintainers">
-            {selectedChart.getMaintainers().map(({ name, email, url }) => (
-              <a
-                key={name}
-                href={url || `mailto:${email}`}
-                target="_blank"
-                rel="noreferrer"
-              >
-                {name}
-              </a>
-            ))}
+            {selectedChart.getMaintainers()
+              .map(({ name, email }) => (
+                <li key={name}>{`${name}<${email}>`}</li>
+              ))}
           </DrawerItem>
           {selectedChart.getKeywords().length > 0 && (
             <DrawerItem name="Keywords" labelsOnly>
diff --git a/src/renderer/components/+helm-charts/helm-chart-store.injectable.ts b/src/renderer/components/+helm-charts/helm-chart-store.injectable.ts
deleted file mode 100644
index ac05d23368..0000000000
--- a/src/renderer/components/+helm-charts/helm-chart-store.injectable.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { HelmChartStore } from "./helm-chart.store";
-
-const helmChartStoreInjectable = getInjectable({
-  id: "helm-chart-store",
-  instantiate: () => new HelmChartStore(),
-});
-
-export default helmChartStoreInjectable;
diff --git a/src/renderer/components/+helm-charts/helm-chart.store.ts b/src/renderer/components/+helm-charts/helm-chart.store.ts
deleted file mode 100644
index 415fe3e333..0000000000
--- a/src/renderer/components/+helm-charts/helm-chart.store.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import semver from "semver";
-import { observable, makeObservable } from "mobx";
-import { autoBind, sortCompareChartVersions } from "../../utils";
-import type { HelmChart } from "../../../common/k8s-api/endpoints/helm-charts.api";
-import { getChartDetails, listCharts } from "../../../common/k8s-api/endpoints/helm-charts.api";
-import { ItemStore } from "../../../common/item.store";
-import flatten from "lodash/flatten";
-
-export interface ChartVersion {
-  repo: string;
-  version: string;
-}
-
-export class HelmChartStore extends ItemStore<HelmChart> {
-  @observable versions = observable.map<string, ChartVersion[]>();
-
-  constructor() {
-    super();
-
-    makeObservable(this);
-    autoBind(this);
-  }
-
-  async loadAll() {
-    try {
-      const res = await this.loadItems(() => listCharts());
-
-      this.failedLoading = false;
-
-      return res;
-    } catch (error) {
-      this.failedLoading = true;
-
-      throw error;
-    }
-  }
-
-  getByName(name: string, repo?: string) {
-    if (typeof repo !== "string") {
-      /**
-       * FIXME:
-       * This is here because in strict mode `getByName` MUST be 100% compatiable if called in the
-       * situation where it is only a "ItemStore"
-       */
-      throw new TypeError("repo must be provided");
-    }
-
-    return this.items.find(chart => chart.getName() === name && chart.getRepository() === repo);
-  }
-
-  protected sortVersions = (versions: ChartVersion[]) => {
-    return versions
-      .map(chartVersion => ({ ...chartVersion, __version: semver.coerce(chartVersion.version, { loose: true }) }))
-      .sort(sortCompareChartVersions)
-      .map(({ __version, ...chartVersion }) => chartVersion);
-  };
-
-  async getVersions(chartName: string, force?: boolean): Promise<ChartVersion[]> {
-    const versions = this.versions.get(chartName);
-
-    if (versions && !force) {
-      return versions;
-    }
-
-    const loadVersions = async (repo: string) => {
-      const { versions } = await getChartDetails(repo, chartName);
-
-      return versions.map(chart => ({
-        repo,
-        version: chart.getVersion(),
-      }));
-    };
-
-    if (!this.isLoaded) {
-      await this.loadAll();
-    }
-    const repos = this.items
-      .filter(chart => chart.getName() === chartName)
-      .map(chart => chart.getRepository());
-
-    const newVersions = await Promise.all(repos.map(loadVersions))
-      .then(flatten)
-      .then(this.sortVersions);
-
-    this.versions.set(chartName, newVersions);
-
-    return newVersions;
-  }
-
-  reset() {
-    super.reset();
-    this.versions.clear();
-  }
-
-  /**
-   * @deprecated Not supported
-   */
-  removeItems(): Promise<void> {
-    throw new Error("removeItems is not supported");
-  }
-}
-
-export const helmChartStore = new HelmChartStore();
diff --git a/src/renderer/components/+helm-charts/helm-charts.tsx b/src/renderer/components/+helm-charts/helm-charts.tsx
index 5a603cf7aa..a8367aac23 100644
--- a/src/renderer/components/+helm-charts/helm-charts.tsx
+++ b/src/renderer/components/+helm-charts/helm-charts.tsx
@@ -7,7 +7,6 @@ import "./helm-charts.scss";
 
 import React, { Component } from "react";
 import { observer } from "mobx-react";
-import { helmChartStore } from "./helm-chart.store";
 import type { HelmChart } from "../../../common/k8s-api/endpoints/helm-charts.api";
 import { HelmChartDetails } from "./helm-chart-details";
 import { ItemListLayout } from "../item-object-list/list-layout";
@@ -21,6 +20,7 @@ import navigateToHelmChartsInjectable from "../../../common/front-end-routing/ro
 import { HelmChartIcon } from "./icon";
 import helmChartsInjectable from "./helm-charts/helm-charts.injectable";
 import selectedHelmChartInjectable from "./helm-charts/selected-helm-chart.injectable";
+import { noop } from "lodash";
 
 enum columnId {
   name = "name",
@@ -35,9 +35,7 @@ interface Dependencies {
     chartName: IComputedValue<string>;
     repo: IComputedValue<string>;
   };
-
   navigateToHelmCharts: NavigateToHelmCharts;
-
   charts: IAsyncComputed<HelmChart[]>;
   selectedChart: IComputedValue<HelmChart | undefined>;
 }
@@ -69,17 +67,31 @@ class NonInjectedHelmCharts extends Component<Dependencies> {
   };
 
   render() {
+    const { charts } = this.props;
     const selectedChart = this.props.selectedChart.get();
 
     return (
       <SiblingsInTabLayout>
         <div data-testid="page-for-helm-charts" style={{ display: "none" }}/>
 
-        <ItemListLayout
+        <ItemListLayout<HelmChart, false>
           isConfigurable
           tableId="helm_charts"
           className="HelmCharts"
-          store={helmChartStore}
+          store={{
+            get isLoaded() {
+              return !charts.pending.get();
+            },
+            failedLoading: false,
+            getTotalCount: () => charts.value.get().length,
+            isSelected: (item) => item === selectedChart,
+            toggleSelection: noop,
+            isSelectedAll: () => false,
+            toggleSelectionAll: () => false,
+            pickOnlySelected: () => [],
+            removeSelectedItems: async () => {},
+          }}
+          preloadStores={false}
           getItems={() => this.props.charts.value.get()}
           isSelectable={false}
           sortingCallbacks={{
@@ -132,16 +144,12 @@ class NonInjectedHelmCharts extends Component<Dependencies> {
   }
 }
 
-export const HelmCharts = withInjectables<Dependencies>(
-  NonInjectedHelmCharts,
-
-  {
-    getProps: (di) => ({
-      routeParameters: di.inject(helmChartsRouteParametersInjectable),
-      navigateToHelmCharts: di.inject(navigateToHelmChartsInjectable),
-      charts: di.inject(helmChartsInjectable),
-      selectedChart: di.inject(selectedHelmChartInjectable),
-    }),
-  },
-);
+export const HelmCharts = withInjectables<Dependencies>(NonInjectedHelmCharts, {
+  getProps: (di) => ({
+    routeParameters: di.inject(helmChartsRouteParametersInjectable),
+    navigateToHelmCharts: di.inject(navigateToHelmChartsInjectable),
+    charts: di.inject(helmChartsInjectable),
+    selectedChart: di.inject(selectedHelmChartInjectable),
+  }),
+});
 
diff --git a/src/renderer/components/+helm-charts/helm-charts/call-for-helm-charts.injectable.ts b/src/renderer/components/+helm-charts/helm-charts/call-for-helm-charts.injectable.ts
deleted file mode 100644
index 5edc0d7bea..0000000000
--- a/src/renderer/components/+helm-charts/helm-charts/call-for-helm-charts.injectable.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { HelmChart } from "../../../../common/k8s-api/endpoints/helm-charts.api";
-import { listCharts } from "../../../../common/k8s-api/endpoints/helm-charts.api";
-
-export type CallForHelmCharts = () => Promise<HelmChart[]>;
-
-const callForHelmChartsInjectable = getInjectable({
-  id: "call-for-helm-charts",
-  instantiate: (): CallForHelmCharts => async () => await listCharts(),
-  causesSideEffects: true,
-});
-
-export default callForHelmChartsInjectable;
diff --git a/src/renderer/components/+helm-charts/helm-charts/helm-charts.injectable.ts b/src/renderer/components/+helm-charts/helm-charts/helm-charts.injectable.ts
index 1324e382a9..70c900dc7b 100644
--- a/src/renderer/components/+helm-charts/helm-charts/helm-charts.injectable.ts
+++ b/src/renderer/components/+helm-charts/helm-charts/helm-charts.injectable.ts
@@ -4,15 +4,18 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { asyncComputed } from "@ogre-tools/injectable-react";
-import callForHelmChartsInjectable from "./call-for-helm-charts.injectable";
+import requestHelmChartsInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable";
 
 const helmChartsInjectable = getInjectable({
   id: "helm-charts",
 
   instantiate: (di) => {
-    const callForHelmCharts = di.inject(callForHelmChartsInjectable);
+    const requestHelmCharts = di.inject(requestHelmChartsInjectable);
 
-    return asyncComputed(async () => await callForHelmCharts(), []);
+    return asyncComputed({
+      getValueFromObservedPromise: requestHelmCharts,
+      valueWhenPending: [],
+    });
   },
 });
 
diff --git a/src/renderer/components/+helm-charts/helm-charts/request-versions-of-chart-for-release.injectable.ts b/src/renderer/components/+helm-charts/helm-charts/request-versions-of-chart-for-release.injectable.ts
new file mode 100644
index 0000000000..b49d94fb10
--- /dev/null
+++ b/src/renderer/components/+helm-charts/helm-charts/request-versions-of-chart-for-release.injectable.ts
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { HelmChart } from "../../../../common/k8s-api/endpoints/helm-charts.api";
+import requestHelmChartVersionsInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable";
+import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api";
+import { sortBySemverVersion } from "../../../utils";
+import type { HelmChartVersion } from "./versions";
+
+/**
+ * @param release The release to try and figure out what chart versions match for
+ * @param charts The list of possible helm charts that `release` could be of
+ */
+export type RequestVersionsOfHelmChart = (release: HelmRelease, charts: HelmChart[]) => Promise<HelmChartVersion[]>;
+
+const requestVersionsOfHelmChartInjectable = getInjectable({
+  id: "request-versions-of-helm-chart-for-helm-release-from-list-of-charts",
+  instantiate: (di): RequestVersionsOfHelmChart => {
+    const requestHelmChartVersions = di.inject(requestHelmChartVersionsInjectable);
+
+    return async (release, charts) => {
+      const rawVersions = await Promise.all((
+        charts
+          .filter(chart => chart.getName() === release.getChart())
+          .map(chart => chart.getRepository())
+          .map(repo => requestHelmChartVersions(repo, release.getChart()))
+      ));
+
+      return sortBySemverVersion(rawVersions.flat());
+    };
+  },
+});
+
+export default requestVersionsOfHelmChartInjectable;
diff --git a/src/renderer/components/+helm-charts/helm-charts/request-versions.injectable.ts b/src/renderer/components/+helm-charts/helm-charts/request-versions.injectable.ts
new file mode 100644
index 0000000000..1dbe685617
--- /dev/null
+++ b/src/renderer/components/+helm-charts/helm-charts/request-versions.injectable.ts
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import requestHelmChartsInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable";
+import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api";
+import requestVersionsOfHelmChartInjectable from "./request-versions-of-chart-for-release.injectable";
+import type { HelmChartVersion } from "./versions";
+
+export type RequestVersionsOfHelmChartFor = (release: HelmRelease) => Promise<HelmChartVersion[]>;
+
+const requestVersionsOfHelmChartForInjectable = getInjectable({
+  id: "request-versions-of-helm-chart-for",
+  instantiate: (di): RequestVersionsOfHelmChartFor => {
+    const requestHelmCharts = di.inject(requestHelmChartsInjectable);
+    const requestVersionsOfHelmChart = di.inject(requestVersionsOfHelmChartInjectable);
+
+    return async (release) => {
+      const charts = await requestHelmCharts();
+
+      return requestVersionsOfHelmChart(release, charts);
+    };
+  },
+});
+
+export default requestVersionsOfHelmChartForInjectable;
+
diff --git a/src/renderer/components/+helm-charts/helm-charts/versions.injectable.ts b/src/renderer/components/+helm-charts/helm-charts/versions.injectable.ts
new file mode 100644
index 0000000000..867052b854
--- /dev/null
+++ b/src/renderer/components/+helm-charts/helm-charts/versions.injectable.ts
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { asyncComputed } from "@ogre-tools/injectable-react";
+import { when } from "mobx";
+import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api";
+import helmChartsInjectable from "./helm-charts.injectable";
+import requestVersionsOfHelmChartInjectable from "./request-versions-of-chart-for-release.injectable";
+
+const helmChartVersionsInjectable = getInjectable({
+  id: "helm-chart-versions-loader",
+
+  instantiate: (di, release) => {
+    const helmCharts = di.inject(helmChartsInjectable);
+    const requestVersionsOfHelmChart = di.inject(requestVersionsOfHelmChartInjectable);
+
+    return asyncComputed({
+      getValueFromObservedPromise: async () => {
+        await when(() => !helmCharts.pending.get());
+
+        return requestVersionsOfHelmChart(release, helmCharts.value.get());
+      },
+    });
+  },
+
+  lifecycle: lifecycleEnum.keyedSingleton({
+    getInstanceKey: (di, release: HelmRelease) => release.getName(),
+  }),
+});
+
+export default helmChartVersionsInjectable;
diff --git a/src/renderer/components/+helm-charts/helm-charts/versions.ts b/src/renderer/components/+helm-charts/helm-charts/versions.ts
new file mode 100644
index 0000000000..950a6931cb
--- /dev/null
+++ b/src/renderer/components/+helm-charts/helm-charts/versions.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+/**
+ * A type for the possible versions that a helm release was made from
+ */
+export interface HelmChartVersion {
+  repo: string;
+  version: string;
+}
diff --git a/src/renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.global-override-for-injectable.ts b/src/renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.global-override-for-injectable.ts
deleted file mode 100644
index 282ef22fe3..0000000000
--- a/src/renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.global-override-for-injectable.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import callForHelmReleasesInjectable from "./call-for-helm-releases.injectable";
-import { getGlobalOverride } from "../../../../common/test-utils/get-global-override";
-
-export default getGlobalOverride(
-  callForHelmReleasesInjectable,
-  () => () => {
-    throw new Error(
-      "Tried to call for helm releases without explicit override.",
-    );
-  },
-);
diff --git a/src/renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.injectable.ts b/src/renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.injectable.ts
deleted file mode 100644
index d166091352..0000000000
--- a/src/renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.injectable.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { HelmReleaseDto } from "../../../../common/k8s-api/endpoints/helm-releases.api";
-
-import { apiBase } from "../../../../common/k8s-api";
-import { endpoint } from "../../../../common/k8s-api/endpoints/helm-releases.api";
-
-export type CallForHelmReleases = (
-  namespace?: string
-) => Promise<HelmReleaseDto[]>;
-
-const callForHelmReleasesInjectable = getInjectable({
-  id: "call-for-helm-releases",
-
-  instantiate: (): CallForHelmReleases => async (namespace) =>
-    await apiBase.get<HelmReleaseDto[]>(endpoint({ namespace })),
-
-  causesSideEffects: true,
-});
-
-export default callForHelmReleasesInjectable;
diff --git a/src/renderer/components/+helm-releases/create-release/call-for-create-helm-release.injectable.ts b/src/renderer/components/+helm-releases/create-release/call-for-create-helm-release.injectable.ts
deleted file mode 100644
index 9e3e3800a3..0000000000
--- a/src/renderer/components/+helm-releases/create-release/call-for-create-helm-release.injectable.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import yaml from "js-yaml";
-import { getInjectable } from "@ogre-tools/injectable";
-import type { HelmReleaseUpdateDetails } from "../../../../common/k8s-api/endpoints/helm-releases.api";
-import { endpoint } from "../../../../common/k8s-api/endpoints/helm-releases.api";
-import { apiBase } from "../../../../common/k8s-api";
-
-interface HelmReleaseCreatePayload {
-  name?: string;
-  repo: string;
-  chart: string;
-  namespace: string;
-  version: string;
-  values: string;
-}
-
-export type CallForCreateHelmRelease = (
-  payload: HelmReleaseCreatePayload
-) => Promise<HelmReleaseUpdateDetails>;
-
-const callForCreateHelmReleaseInjectable = getInjectable({
-  id: "call-for-create-helm-release",
-
-  instantiate: (): CallForCreateHelmRelease => (payload) => {
-    const { repo, chart: rawChart, values: rawValues, ...data } = payload;
-    const chart = `${repo}/${rawChart}`;
-    const values = yaml.load(rawValues);
-
-    return apiBase.post(endpoint(), {
-      data: {
-        chart,
-        values,
-        ...data,
-      },
-    });
-  },
-
-  causesSideEffects: true,
-});
-
-export default callForCreateHelmReleaseInjectable;
diff --git a/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts b/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts
index 51006266c8..515895abec 100644
--- a/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts
+++ b/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts
@@ -5,15 +5,15 @@
 import { getInjectable } from "@ogre-tools/injectable";
 
 import releasesInjectable from "../releases.injectable";
-import type { CallForCreateHelmRelease } from "./call-for-create-helm-release.injectable";
-import callForCreateHelmReleaseInjectable from "./call-for-create-helm-release.injectable";
+import type { RequestCreateHelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable";
+import requestCreateHelmReleaseInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable";
 
 const createReleaseInjectable = getInjectable({
   id: "create-release",
 
-  instantiate: (di): CallForCreateHelmRelease => {
+  instantiate: (di): RequestCreateHelmRelease => {
     const releases = di.inject(releasesInjectable);
-    const callForCreateRelease = di.inject(callForCreateHelmReleaseInjectable);
+    const callForCreateRelease = di.inject(requestCreateHelmReleaseInjectable);
 
     return async (payload) => {
       const release = await callForCreateRelease(payload);
diff --git a/src/renderer/components/+helm-releases/delete-release/delete-release.injectable.ts b/src/renderer/components/+helm-releases/delete-release/delete-release.injectable.ts
index 4619ddaf1f..f84416b01a 100644
--- a/src/renderer/components/+helm-releases/delete-release/delete-release.injectable.ts
+++ b/src/renderer/components/+helm-releases/delete-release/delete-release.injectable.ts
@@ -3,11 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type {
-  HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api";
-import {
-  deleteRelease,
-} from "../../../../common/k8s-api/endpoints/helm-releases.api";
+import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api";
+import requestDeleteHelmReleaseInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/request-delete.injectable";
 import releasesInjectable from "../releases.injectable";
 
 const deleteReleaseInjectable = getInjectable({
@@ -15,9 +12,10 @@ const deleteReleaseInjectable = getInjectable({
 
   instantiate: (di) => {
     const releases = di.inject(releasesInjectable);
+    const requestDeleteHelmRelease = di.inject(requestDeleteHelmReleaseInjectable);
 
     return async (release: HelmRelease) => {
-      await deleteRelease(release.getName(), release.getNs());
+      await requestDeleteHelmRelease(release.getName(), release.getNs());
 
       releases.invalidate();
     };
diff --git a/src/renderer/components/+helm-releases/dialog/dialog.tsx b/src/renderer/components/+helm-releases/dialog/dialog.tsx
index 5655720e10..9a7c3373d4 100644
--- a/src/renderer/components/+helm-releases/dialog/dialog.tsx
+++ b/src/renderer/components/+helm-releases/dialog/dialog.tsx
@@ -13,20 +13,23 @@ import type { DialogProps } from "../../dialog";
 import { Dialog } from "../../dialog";
 import { Wizard, WizardStep } from "../../wizard";
 import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api";
-import { getReleaseHistory, type HelmReleaseRevision } from "../../../../common/k8s-api/endpoints/helm-releases.api";
 import { Select } from "../../select";
 import { Notifications } from "../../notifications";
 import orderBy from "lodash/orderBy";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import releaseRollbackDialogStateInjectable from "./state.injectable";
+import type { RollbackRelease } from "../rollback-release/rollback-release.injectable";
 import rollbackReleaseInjectable from "../rollback-release/rollback-release.injectable";
+import type { HelmReleaseRevision, RequestHelmReleaseHistory } from "../../../../common/k8s-api/endpoints/helm-releases.api/request-history.injectable";
+import requestHelmReleaseHistoryInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/request-history.injectable";
 
 export interface ReleaseRollbackDialogProps extends DialogProps {
 }
 
 interface Dependencies {
-  rollbackRelease: (releaseName: string, namespace: string, revisionNumber: number) => Promise<void>;
+  rollbackRelease: RollbackRelease;
   state: IObservableValue<HelmRelease | undefined>;
+  requestHelmReleaseHistory: RequestHelmReleaseHistory;
 }
 
 @observer
@@ -48,7 +51,7 @@ class NonInjectedReleaseRollbackDialog extends React.Component<ReleaseRollbackDi
   onOpen = async (release: HelmRelease) => {
     this.isLoading.set(true);
 
-    const releases = await getReleaseHistory(release.getName(), release.getNs());
+    const releases = await this.props.requestHelmReleaseHistory(release.getName(), release.getNs());
 
     runInAction(() => {
       this.revisions.replace(orderBy(releases, "revision", "desc"));
@@ -134,14 +137,11 @@ class NonInjectedReleaseRollbackDialog extends React.Component<ReleaseRollbackDi
   }
 }
 
-export const ReleaseRollbackDialog = withInjectables<Dependencies, ReleaseRollbackDialogProps>(
-  NonInjectedReleaseRollbackDialog,
-
-  {
-    getProps: (di, props) => ({
-      rollbackRelease: di.inject(rollbackReleaseInjectable),
-      state: di.inject(releaseRollbackDialogStateInjectable),
-      ...props,
-    }),
-  },
-);
+export const ReleaseRollbackDialog = withInjectables<Dependencies, ReleaseRollbackDialogProps>(NonInjectedReleaseRollbackDialog, {
+  getProps: (di, props) => ({
+    ...props,
+    rollbackRelease: di.inject(rollbackReleaseInjectable),
+    state: di.inject(releaseRollbackDialogStateInjectable),
+    requestHelmReleaseHistory: di.inject(requestHelmReleaseHistoryInjectable),
+  }),
+});
diff --git a/src/renderer/components/+helm-releases/release-details/release-details-content.tsx b/src/renderer/components/+helm-releases/release-details/release-details-content.tsx
index b2bacbd479..02e3255304 100644
--- a/src/renderer/components/+helm-releases/release-details/release-details-content.tsx
+++ b/src/renderer/components/+helm-releases/release-details/release-details-content.tsx
@@ -19,7 +19,6 @@ import { kebabCase } from "lodash/fp";
 import { Badge } from "../../badge";
 import { SubTitle } from "../../layout/sub-title";
 import { Table, TableCell, TableHead, TableRow } from "../../table";
-import { ReactiveDuration } from "../../duration/reactive-duration";
 import { Checkbox } from "../../checkbox";
 import { MonacoEditor } from "../../monaco-editor";
 import { Spinner } from "../../spinner";
@@ -131,12 +130,10 @@ const ResourceGroup = ({
         <TableCell className="name">Name</TableCell>
 
         {isNamespaced && <TableCell className="namespace">Namespace</TableCell>}
-
-        <TableCell className="age">Age</TableCell>
       </TableHead>
 
       {resources.map(
-        ({ creationTimestamp, detailsUrl, name, namespace, uid }) => (
+        ({ detailsUrl, name, namespace, uid }) => (
           <TableRow key={uid}>
             <TableCell className="name">
               {detailsUrl ? <Link to={detailsUrl}>{name}</Link> : name}
@@ -145,10 +142,6 @@ const ResourceGroup = ({
             {isNamespaced && (
               <TableCell className="namespace">{namespace}</TableCell>
             )}
-
-            <TableCell className="age">
-              <ReactiveDuration timestamp={creationTimestamp} />
-            </TableCell>
           </TableRow>
         ),
       )}
diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.global-override-for-injectable.ts b/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.global-override-for-injectable.ts
deleted file mode 100644
index e54f980728..0000000000
--- a/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.global-override-for-injectable.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getGlobalOverride } from "../../../../../../common/test-utils/get-global-override";
-import callForHelmReleaseConfigurationInjectable from "./call-for-helm-release-configuration.injectable";
-
-export default getGlobalOverride(
-  callForHelmReleaseConfigurationInjectable,
-  () => () => {
-    throw new Error(
-      "Tried to call for helm release configuration without explicit override.",
-    );
-  },
-);
diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.injectable.ts b/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.injectable.ts
deleted file mode 100644
index d0ed0fac7c..0000000000
--- a/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.injectable.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { apiBase } from "../../../../../../common/k8s-api";
-import { endpoint } from "../../../../../../common/k8s-api/endpoints/helm-releases.api";
-
-export type CallForHelmReleaseConfiguration = (
-  name: string,
-  namespace: string,
-  all: boolean
-) => Promise<string>;
-
-const callForHelmReleaseConfigurationInjectable = getInjectable({
-  id: "call-for-helm-release-configuration",
-
-  instantiate:
-    (): CallForHelmReleaseConfiguration => async (name, namespace, all: boolean) => {
-      const route = "values";
-      const path = endpoint({ name, namespace, route }, { all });
-
-      return apiBase.get<string>(path);
-    },
-
-  causesSideEffects: true,
-});
-
-export default callForHelmReleaseConfigurationInjectable;
diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release-details/call-for-helm-release-details.injectable.ts b/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release-details/call-for-helm-release-details.injectable.ts
deleted file mode 100644
index e5dccb1340..0000000000
--- a/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release-details/call-for-helm-release-details.injectable.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { apiBase } from "../../../../../../../common/k8s-api";
-import { endpoint } from "../../../../../../../common/k8s-api/endpoints/helm-releases.api";
-import type { KubeJsonApiData } from "../../../../../../../common/k8s-api/kube-json-api";
-
-export interface HelmReleaseDetails {
-  resources: KubeJsonApiData[];
-  name: string;
-  namespace: string;
-  version: string;
-  config: string; // release values
-  manifest: string;
-
-  info: {
-    deleted: string;
-    description: string;
-    first_deployed: string;
-    last_deployed: string;
-    notes: string;
-    status: string;
-  };
-}
-
-export type CallForHelmReleaseDetails = (
-  name: string,
-  namespace: string
-) => Promise<HelmReleaseDetails>;
-
-const callForHelmReleaseDetailsInjectable = getInjectable({
-  id: "call-for-helm-release-details",
-
-  instantiate: (): CallForHelmReleaseDetails => async (name, namespace) => {
-    const path = endpoint({ name, namespace });
-
-    return apiBase.get<HelmReleaseDetails>(path);
-  },
-
-  causesSideEffects: true,
-});
-
-export default callForHelmReleaseDetailsInjectable;
diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release.injectable.ts b/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release.injectable.ts
deleted file mode 100644
index bfcc947d08..0000000000
--- a/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release.injectable.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { HelmReleaseDto } from "../../../../../../common/k8s-api/endpoints/helm-releases.api";
-import callForHelmReleasesInjectable from "../../../call-for-helm-releases/call-for-helm-releases.injectable";
-import type { HelmReleaseDetails } from "./call-for-helm-release-details/call-for-helm-release-details.injectable";
-import callForHelmReleaseDetailsInjectable from "./call-for-helm-release-details/call-for-helm-release-details.injectable";
-import type { AsyncResult } from "../../../../../../common/utils/async-result";
-
-export interface DetailedHelmRelease {
-  release: HelmReleaseDto;
-  details: HelmReleaseDetails;
-}
-
-export type CallForHelmRelease = (
-  name: string,
-  namespace: string
-) => Promise<AsyncResult<DetailedHelmRelease | undefined>>;
-
-const callForHelmReleaseInjectable = getInjectable({
-  id: "call-for-helm-release",
-
-  instantiate: (di): CallForHelmRelease => {
-    const callForHelmReleases = di.inject(callForHelmReleasesInjectable);
-    const callForHelmReleaseDetails = di.inject(callForHelmReleaseDetailsInjectable);
-
-    return async (name, namespace) => {
-      const [releases, details] = await Promise.all([
-        callForHelmReleases(namespace),
-        callForHelmReleaseDetails(name, namespace),
-      ]);
-
-      const release = releases.find(
-        (rel) => rel.name === name && rel.namespace === namespace,
-      );
-
-      if (!release) {
-        return {
-          callWasSuccessful: false,
-          error: `Release ${name} didn't exist in ${namespace} namespace.`,
-        };
-      }
-
-      return { callWasSuccessful: true, response: { release, details }};
-    };
-  },
-});
-
-export default callForHelmReleaseInjectable;
diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/release-details-model.injectable.tsx b/src/renderer/components/+helm-releases/release-details/release-details-model/release-details-model.injectable.tsx
index ebedbcdcdf..acd65374b9 100644
--- a/src/renderer/components/+helm-releases/release-details/release-details-model/release-details-model.injectable.tsx
+++ b/src/renderer/components/+helm-releases/release-details/release-details-model/release-details-model.injectable.tsx
@@ -6,18 +6,17 @@ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
 import type { IComputedValue, IObservableValue } from "mobx";
 import { runInAction, action, observable, computed } from "mobx";
 import type { TargetHelmRelease } from "../target-helm-release.injectable";
-import type { CallForHelmRelease, DetailedHelmRelease } from "./call-for-helm-release/call-for-helm-release.injectable";
-import callForHelmReleaseInjectable from "./call-for-helm-release/call-for-helm-release.injectable";
+import type { RequestDetailedHelmRelease, DetailedHelmRelease } from "./request-detailed-helm-release.injectable";
+import requestDetailedHelmReleaseInjectable from "./request-detailed-helm-release.injectable";
 import type { LensTheme } from "../../../../themes/store";
-import type { CallForHelmReleaseConfiguration } from "./call-for-helm-release-configuration/call-for-helm-release-configuration.injectable";
-import callForHelmReleaseConfigurationInjectable from "./call-for-helm-release-configuration/call-for-helm-release-configuration.injectable";
-import { toHelmRelease } from "../../releases.injectable";
+import type { RequestHelmReleaseConfiguration } from "../../../../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable";
+import requestHelmReleaseConfigurationInjectable from "../../../../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable";
 import { pipeline } from "@ogre-tools/fp";
 import { groupBy, map } from "lodash/fp";
 import type { KubeJsonApiData } from "../../../../../common/k8s-api/kube-json-api";
 import type { GetResourceDetailsUrl } from "./get-resource-details-url.injectable";
 import getResourceDetailsUrlInjectable from "./get-resource-details-url.injectable";
-import type { CallForHelmReleaseUpdate } from "../../update-release/call-for-helm-release-update/call-for-helm-release-update.injectable";
+import type { RequestHelmReleaseUpdate } from "../../../../../common/k8s-api/endpoints/helm-releases.api/request-update.injectable";
 import updateReleaseInjectable from "../../update-release/update-release.injectable";
 import type { ShowCheckedErrorNotification } from "../../../notifications/show-checked-error.injectable";
 import showCheckedErrorNotificationInjectable from "../../../notifications/show-checked-error.injectable";
@@ -26,35 +25,29 @@ import showSuccessNotificationInjectable from "../../../notifications/show-succe
 import React from "react";
 import createUpgradeChartTabInjectable from "../../../dock/upgrade-chart/create-upgrade-chart-tab.injectable";
 import type { HelmRelease } from "../../../../../common/k8s-api/endpoints/helm-releases.api";
+import type { NavigateToHelmReleases } from "../../../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable";
 import navigateToHelmReleasesInjectable from "../../../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable";
 import assert from "assert";
 import activeThemeInjectable from "../../../../themes/active.injectable";
+import type { ToHelmRelease } from "../../to-helm-release.injectable";
+import toHelmReleaseInjectable from "../../to-helm-release.injectable";
 
 const releaseDetailsModelInjectable = getInjectable({
   id: "release-details-model",
 
   instantiate: async (di, targetRelease: TargetHelmRelease) => {
-    const callForHelmRelease = di.inject(callForHelmReleaseInjectable);
-    const callForHelmReleaseConfiguration = di.inject(callForHelmReleaseConfigurationInjectable);
-    const activeTheme = di.inject(activeThemeInjectable);
-    const getResourceDetailsUrl = di.inject(getResourceDetailsUrlInjectable);
-    const updateRelease = di.inject(updateReleaseInjectable);
-    const showCheckedErrorNotification = di.inject(showCheckedErrorNotificationInjectable);
-    const showSuccessNotification = di.inject(showSuccessNotificationInjectable);
-    const createUpgradeChartTab = di.inject(createUpgradeChartTabInjectable);
-    const navigateToHelmReleases = di.inject(navigateToHelmReleasesInjectable);
-
     const model = new ReleaseDetailsModel({
-      callForHelmRelease,
+      requestDetailedHelmRelease: di.inject(requestDetailedHelmReleaseInjectable),
       targetRelease,
-      activeTheme,
-      callForHelmReleaseConfiguration,
-      getResourceDetailsUrl,
-      updateRelease,
-      showCheckedErrorNotification,
-      showSuccessNotification,
-      createUpgradeChartTab,
-      navigateToHelmReleases,
+      activeTheme: di.inject(activeThemeInjectable),
+      requestHelmReleaseConfiguration: di.inject(requestHelmReleaseConfigurationInjectable),
+      getResourceDetailsUrl: di.inject(getResourceDetailsUrlInjectable),
+      updateRelease: di.inject(updateReleaseInjectable),
+      showCheckedErrorNotification: di.inject(showCheckedErrorNotificationInjectable),
+      showSuccessNotification: di.inject(showSuccessNotificationInjectable),
+      createUpgradeChartTab: di.inject(createUpgradeChartTabInjectable),
+      navigateToHelmReleases: di.inject(navigateToHelmReleasesInjectable),
+      toHelmRelease: di.inject(toHelmReleaseInjectable),
     });
 
     await model.load();
@@ -85,20 +78,21 @@ export interface ConfigurationInput {
 interface Dependencies {
   readonly targetRelease: TargetHelmRelease;
   readonly activeTheme: IComputedValue<LensTheme>;
-  callForHelmRelease: CallForHelmRelease;
-  callForHelmReleaseConfiguration: CallForHelmReleaseConfiguration;
+  requestDetailedHelmRelease: RequestDetailedHelmRelease;
+  requestHelmReleaseConfiguration: RequestHelmReleaseConfiguration;
   getResourceDetailsUrl: GetResourceDetailsUrl;
-  updateRelease: CallForHelmReleaseUpdate;
+  updateRelease: RequestHelmReleaseUpdate;
   showCheckedErrorNotification: ShowCheckedErrorNotification;
   showSuccessNotification: ShowNotification;
   createUpgradeChartTab: (release: HelmRelease) => string;
-  navigateToHelmReleases: () => void;
+  navigateToHelmReleases: NavigateToHelmReleases;
+  toHelmRelease: ToHelmRelease;
 }
 
 export class ReleaseDetailsModel {
   readonly id = `${this.dependencies.targetRelease.namespace}/${this.dependencies.targetRelease.name}`;
 
-  constructor(private readonly dependencies: Dependencies) {}
+  constructor(protected readonly dependencies: Dependencies) {}
 
   private readonly detailedRelease = observable.box<DetailedHelmRelease | undefined>();
 
@@ -134,7 +128,7 @@ export class ReleaseDetailsModel {
         this.configuration.isSaving.set(false);
       });
 
-      if (!result.updateWasSuccessful) {
+      if (!result.callWasSuccessful) {
         this.dependencies.showCheckedErrorNotification(
           result.error,
           "Unknown error occured while updating release",
@@ -171,7 +165,7 @@ export class ReleaseDetailsModel {
   load = async () => {
     const { name, namespace } = this.dependencies.targetRelease;
 
-    const result = await this.dependencies.callForHelmRelease(
+    const result = await this.dependencies.requestDetailedHelmRelease(
       name,
       namespace,
     );
@@ -199,7 +193,7 @@ export class ReleaseDetailsModel {
     const { name, namespace } = this.release;
 
     const configuration =
-      await this.dependencies.callForHelmReleaseConfiguration(
+      await this.dependencies.requestHelmReleaseConfiguration(
         name,
         namespace,
         !this.onlyUserSuppliedValuesAreShown.value.get(),
@@ -216,7 +210,7 @@ export class ReleaseDetailsModel {
 
     assert(detailedRelease, "Tried to access release before load");
 
-    return toHelmRelease(detailedRelease.release);
+    return this.dependencies.toHelmRelease(detailedRelease.release);
   }
 
   @computed private get details() {
@@ -228,12 +222,12 @@ export class ReleaseDetailsModel {
   }
 
   @computed get notes() {
-    return this.details.info.notes;
+    return this.details?.info.notes ?? "";
   }
 
   @computed get groupedResources(): MinimalResourceGroup[] {
     return pipeline(
-      this.details.resources,
+      this.details?.resources ?? [],
       groupBy((resource) => resource.kind),
       (grouped) => Object.entries(grouped),
 
@@ -277,20 +271,17 @@ export interface MinimalResource {
   name: string;
   namespace: string | undefined;
   detailsUrl: string | undefined;
-  creationTimestamp: string | undefined;
 }
 
 const toMinimalResourceFor =
   (getResourceDetailsUrl: GetResourceDetailsUrl, kind: string) =>
     (resource: KubeJsonApiData): MinimalResource => {
-      const { creationTimestamp, name, namespace, uid } = resource.metadata;
+      const { name, namespace, uid } = resource.metadata;
 
       return {
         uid,
         name,
         namespace,
-        creationTimestamp,
-
         detailsUrl: getResourceDetailsUrl(
           kind,
           resource.apiVersion,
diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable.ts b/src/renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable.ts
new file mode 100644
index 0000000000..aa5a2e9121
--- /dev/null
+++ b/src/renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable.ts
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { HelmReleaseDto } from "../../../../../common/k8s-api/endpoints/helm-releases.api";
+import requestHelmReleasesInjectable from "../../../../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable";
+import type { HelmReleaseDetails } from "../../../../../common/k8s-api/endpoints/helm-releases.api/request-details.injectable";
+import requestHelmReleaseDetailsInjectable from "../../../../../common/k8s-api/endpoints/helm-releases.api/request-details.injectable";
+import type { AsyncResult } from "../../../../../common/utils/async-result";
+
+export interface DetailedHelmRelease {
+  release: HelmReleaseDto;
+  details?: HelmReleaseDetails;
+}
+
+export type RequestDetailedHelmRelease = (
+  name: string,
+  namespace: string
+) => Promise<AsyncResult<DetailedHelmRelease>>;
+
+const requestDetailedHelmReleaseInjectable = getInjectable({
+  id: "request-detailed-helm-release",
+
+  instantiate: (di): RequestDetailedHelmRelease => {
+    const requestHelmReleases = di.inject(requestHelmReleasesInjectable);
+    const requestHelmReleaseDetails = di.inject(requestHelmReleaseDetailsInjectable);
+
+    return async (name, namespace) => {
+      const [releases, details] = await Promise.all([
+        requestHelmReleases(namespace),
+        requestHelmReleaseDetails(name, namespace),
+      ]);
+
+      const release = releases.find(
+        (rel) => rel.name === name && rel.namespace === namespace,
+      );
+
+      if (!release) {
+        return {
+          callWasSuccessful: false,
+          error: `Release ${name} didn't exist in ${namespace} namespace.`,
+        };
+      }
+
+      return { callWasSuccessful: true, response: { release, details }};
+    };
+  },
+});
+
+export default requestDetailedHelmReleaseInjectable;
diff --git a/src/renderer/components/+helm-releases/release-menu.tsx b/src/renderer/components/+helm-releases/release-menu.tsx
index a53c59a682..694dd69b3c 100644
--- a/src/renderer/components/+helm-releases/release-menu.tsx
+++ b/src/renderer/components/+helm-releases/release-menu.tsx
@@ -61,7 +61,10 @@ class NonInjectedHelmReleaseMenu extends React.Component<HelmReleaseMenuProps &
             <span className="title">Rollback</span>
           </MenuItem>
         )}
-        <MenuItem onClick={this.upgrade}>
+        <MenuItem
+          onClick={this.upgrade}
+          data-testid={`upgrade-chart-menu-item-for-${release.getId()}`}
+        >
           <Icon
             material="refresh"
             interactive={toolbar}
@@ -79,6 +82,10 @@ class NonInjectedHelmReleaseMenu extends React.Component<HelmReleaseMenuProps &
     return (
       <MenuActions
         id={`menu-actions-for-release-menu-for-${release.getId()}`}
+        triggerIcon={{
+          material: "more_vert",
+          "data-testid": `menu-actions-icon-for-release-menu-for-${release.getId()}`,
+        }}
         {...menuProps}
         className={cssNames("HelmReleaseMenu", className)}
         removeAction={this.remove}
diff --git a/src/renderer/components/+helm-releases/releases.injectable.ts b/src/renderer/components/+helm-releases/releases.injectable.ts
index 694f0d379e..ed3d8d6b8e 100644
--- a/src/renderer/components/+helm-releases/releases.injectable.ts
+++ b/src/renderer/components/+helm-releases/releases.injectable.ts
@@ -4,111 +4,37 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { asyncComputed } from "@ogre-tools/injectable-react";
-import namespaceStoreInjectable from "../+namespaces/store.injectable";
 import clusterFrameContextInjectable from "../../cluster-frame-context/cluster-frame-context.injectable";
 import releaseSecretsInjectable from "./release-secrets.injectable";
-import callForHelmReleasesInjectable from "./call-for-helm-releases/call-for-helm-releases.injectable";
-import type { HelmRelease, HelmReleaseDto } from "../../../common/k8s-api/endpoints/helm-releases.api";
-import { formatDuration } from "../../../common/utils";
-import { helmChartStore } from "../+helm-charts/helm-chart.store";
-import { capitalize } from "lodash/fp";
+import requestHelmReleasesInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable";
+import toHelmReleaseInjectable from "./to-helm-release.injectable";
 
 const releasesInjectable = getInjectable({
   id: "releases",
 
   instantiate: (di) => {
     const clusterContext = di.inject(clusterFrameContextInjectable);
-    const namespaceStore = di.inject(namespaceStoreInjectable);
     const releaseSecrets = di.inject(releaseSecretsInjectable);
-    const callForHelmReleases = di.inject(callForHelmReleasesInjectable);
+    const requestHelmReleases = di.inject(requestHelmReleasesInjectable);
+    const toHelmRelease = di.inject(toHelmReleaseInjectable);
 
-    return asyncComputed(async () => {
-      const contextNamespaces = namespaceStore.contextNamespaces || [];
+    return asyncComputed({
+      getValueFromObservedPromise: async () => {
+        void releaseSecrets.get();
 
-      void releaseSecrets.get();
+        const releaseArrays = await (clusterContext.hasSelectedAll
+          ? requestHelmReleases()
+          : Promise.all(
+            clusterContext.contextNamespaces.map((namespace) =>
+              requestHelmReleases(namespace),
+            ),
+          ));
 
-      const isLoadingAll =
-        clusterContext.allNamespaces?.length > 1 &&
-        clusterContext.cluster?.accessibleNamespaces.length === 0 &&
-        clusterContext.allNamespaces.every((namespace) =>
-          contextNamespaces.includes(namespace),
-        );
+        return releaseArrays.flat().map(toHelmRelease);
+      },
 
-      const releaseArrays = await (isLoadingAll ? callForHelmReleases() : Promise.all(
-        contextNamespaces.map((namespace) =>
-          callForHelmReleases(namespace),
-        ),
-      ));
-
-      return releaseArrays.flat().map(toHelmRelease);
-    }, []);
-  },
-});
-
-export const toHelmRelease = (release: HelmReleaseDto) : HelmRelease => ({
-  ...release,
-
-  getId() {
-    return `${this.namespace}/${this.name}`;
-  },
-
-  getName() {
-    return this.name;
-  },
-
-  getNs() {
-    return this.namespace;
-  },
-
-  getChart(withVersion = false) {
-    let chart = this.chart;
-
-    if (!withVersion && this.getVersion() != "") {
-      const search = new RegExp(`-${this.getVersion()}`);
-
-      chart = chart.replace(search, "");
-    }
-
-    return chart;
-  },
-
-  getRevision() {
-    return parseInt(this.revision, 10);
-  },
-
-  getStatus() {
-    return capitalize(this.status);
-  },
-
-  getVersion() {
-    const versions = this.chart.match(/(?<=-)(v?\d+)[^-].*$/);
-
-    return versions?.[0] ?? "";
-  },
-
-  getUpdated(humanize = true, compact = true) {
-    const updated = this.updated.replace(/\s\w*$/, ""); // 2019-11-26 10:58:09 +0300 MSK -> 2019-11-26 10:58:09 +0300 to pass into Date()
-    const updatedDate = new Date(updated).getTime();
-    const diff = Date.now() - updatedDate;
-
-    if (humanize) {
-      return formatDuration(diff, compact);
-    }
-
-    return diff;
-  },
-
-  // Helm does not store from what repository the release is installed,
-  // so we have to try to guess it by searching charts
-  async getRepo() {
-    const chartName = this.getChart();
-    const version = this.getVersion();
-    const versions = await helmChartStore.getVersions(chartName);
-    const chartVersion = versions.find(
-      (chartVersion) => chartVersion.version === version,
-    );
-
-    return chartVersion ? chartVersion.repo : "";
+      valueWhenPending: [],
+    });
   },
 });
 
diff --git a/src/renderer/components/+helm-releases/rollback-release/rollback-release.injectable.ts b/src/renderer/components/+helm-releases/rollback-release/rollback-release.injectable.ts
index c7ace21e06..fabac39316 100644
--- a/src/renderer/components/+helm-releases/rollback-release/rollback-release.injectable.ts
+++ b/src/renderer/components/+helm-releases/rollback-release/rollback-release.injectable.ts
@@ -3,17 +3,20 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { rollbackRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api";
+import requestHelmReleaseRollbackInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/request-rollback.injectable";
 import releasesInjectable from "../releases.injectable";
 
+export type RollbackRelease = (name: string, namespace: string, revision: number) => Promise<void>;
+
 const rollbackReleaseInjectable = getInjectable({
   id: "rollback-release",
 
-  instantiate: (di) => {
+  instantiate: (di): RollbackRelease => {
     const releases = di.inject(releasesInjectable);
+    const requestHelmReleaseRollback = di.inject(requestHelmReleaseRollbackInjectable);
 
-    return async (name: string, namespace: string, revision: number) => {
-      await rollbackRelease(name, namespace, revision);
+    return async (name, namespace, revision) => {
+      await requestHelmReleaseRollback(name, namespace, revision);
 
       releases.invalidate();
     };
diff --git a/src/renderer/components/+helm-releases/to-helm-release.injectable.ts b/src/renderer/components/+helm-releases/to-helm-release.injectable.ts
new file mode 100644
index 0000000000..d8b27625e6
--- /dev/null
+++ b/src/renderer/components/+helm-releases/to-helm-release.injectable.ts
@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { capitalize } from "lodash";
+import { when } from "mobx";
+import helmChartVersionsInjectable from "../+helm-charts/helm-charts/versions.injectable";
+import type { HelmRelease, HelmReleaseDto } from "../../../common/k8s-api/endpoints/helm-releases.api";
+import { getMillisecondsFromUnixEpoch } from "../../../common/utils/date/get-current-date-time";
+import { formatDuration } from "../../utils";
+
+export type ToHelmRelease = (release: HelmReleaseDto) => HelmRelease;
+
+const toHelmReleaseInjectable = getInjectable({
+  id: "to-helm-release",
+  instantiate: (di): ToHelmRelease => {
+    const helmChartVersions = (release: HelmRelease) => di.inject(helmChartVersionsInjectable, release);
+
+    return (release) => ({
+      ...release,
+
+      getId() {
+        return `${this.namespace}/${this.name}`;
+      },
+
+      getName() {
+        return this.name;
+      },
+
+      getNs() {
+        return this.namespace;
+      },
+
+      getChart(withVersion = false) {
+        let chart = this.chart;
+
+        if (!withVersion && this.getVersion() != "") {
+          const search = new RegExp(`-${this.getVersion()}`);
+
+          chart = chart.replace(search, "");
+        }
+
+        return chart;
+      },
+
+      getRevision() {
+        return parseInt(this.revision, 10);
+      },
+
+      getStatus() {
+        return capitalize(this.status);
+      },
+
+      getVersion() {
+        const versions = this.chart.match(/(?<=-)(v?\d+)[^-].*$/);
+
+        return versions?.[0] ?? "";
+      },
+
+      getUpdated(humanize = true, compact = true) {
+        const updated = this.updated.replace(/\s\w*$/, ""); // 2019-11-26 10:58:09 +0300 MSK -> 2019-11-26 10:58:09 +0300 to pass into Date()
+        const updatedDate = new Date(updated).getTime();
+        const diff = getMillisecondsFromUnixEpoch() - updatedDate;
+
+        if (humanize) {
+          return formatDuration(diff, compact);
+        }
+
+        return diff;
+      },
+
+      // Helm does not store from what repository the release is installed,
+      // so we have to try to guess it by searching charts
+      async getRepo() {
+        const versionsComputed = helmChartVersions(this);
+        const version = this.getVersion();
+
+        await when(() => !versionsComputed.pending.get());
+
+        return versionsComputed.value
+          .get()
+          .find((chartVersion) => chartVersion.version === version)?.repo
+          ?? "";
+      },
+    });
+  },
+});
+
+export default toHelmReleaseInjectable;
diff --git a/src/renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.global-override-for-injectable.ts b/src/renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.global-override-for-injectable.ts
deleted file mode 100644
index 34cc147e8d..0000000000
--- a/src/renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.global-override-for-injectable.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getGlobalOverride } from "../../../../../common/test-utils/get-global-override";
-import callForHelmReleaseUpdateInjectable from "./call-for-helm-release-update.injectable";
-
-export default getGlobalOverride(
-  callForHelmReleaseUpdateInjectable,
-  () => () => {
-    throw new Error(
-      "Tried to call for helm release update without explicit override.",
-    );
-  },
-);
diff --git a/src/renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.injectable.ts b/src/renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.injectable.ts
deleted file mode 100644
index b3cc590163..0000000000
--- a/src/renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.injectable.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { apiBase } from "../../../../../common/k8s-api";
-import { endpoint } from "../../../../../common/k8s-api/endpoints/helm-releases.api";
-import yaml from "js-yaml";
-
-interface HelmReleaseUpdatePayload {
-  repo: string;
-  chart: string;
-  version: string;
-  values: string;
-}
-
-export type CallForHelmReleaseUpdate = (
-  name: string,
-  namespace: string,
-  payload: HelmReleaseUpdatePayload
-) => Promise<{ updateWasSuccessful: true } | { updateWasSuccessful: false; error: unknown }>;
-
-const callForHelmReleaseUpdateInjectable = getInjectable({
-  id: "call-for-helm-release-update",
-
-  instantiate:
-    (): CallForHelmReleaseUpdate => async (name, namespace, payload) => {
-      const { repo, chart: rawChart, values: rawValues, ...data } = payload;
-      const chart = `${repo}/${rawChart}`;
-      const values = yaml.load(rawValues);
-
-      try {
-        await apiBase.put(endpoint({ name, namespace }), {
-          data: {
-            chart,
-            values,
-            ...data,
-          },
-        });
-      } catch (e) {
-        return { updateWasSuccessful: false, error: e };
-      }
-
-      return { updateWasSuccessful: true };
-    },
-
-  causesSideEffects: true,
-});
-
-export default callForHelmReleaseUpdateInjectable;
diff --git a/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts b/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts
index dce16e2dd1..309c19444b 100644
--- a/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts
+++ b/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts
@@ -4,22 +4,22 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import releasesInjectable from "../releases.injectable";
-import type { CallForHelmReleaseUpdate } from "./call-for-helm-release-update/call-for-helm-release-update.injectable";
-import callForHelmReleaseUpdateInjectable from "./call-for-helm-release-update/call-for-helm-release-update.injectable";
+import type { RequestHelmReleaseUpdate } from "../../../../common/k8s-api/endpoints/helm-releases.api/request-update.injectable";
+import requestHelmReleaseUpdateInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/request-update.injectable";
 
 const updateReleaseInjectable = getInjectable({
   id: "update-release",
 
-  instantiate: (di): CallForHelmReleaseUpdate => {
+  instantiate: (di): RequestHelmReleaseUpdate => {
     const releases = di.inject(releasesInjectable);
-    const callForHelmReleaseUpdate = di.inject(callForHelmReleaseUpdateInjectable);
+    const requestHelmReleaseUpdate = di.inject(requestHelmReleaseUpdateInjectable);
 
     return async (
       name,
       namespace,
       payload,
     ) => {
-      const result = await callForHelmReleaseUpdate(name, namespace, payload);
+      const result = await requestHelmReleaseUpdate(name, namespace, payload);
 
       releases.invalidate();
 
diff --git a/src/renderer/components/+namespaces/__snapshots__/namespace-select-filter.test.tsx.snap b/src/renderer/components/+namespaces/__snapshots__/namespace-select-filter.test.tsx.snap
index 5d147fea18..3bf716f2d4 100644
--- a/src/renderer/components/+namespaces/__snapshots__/namespace-select-filter.test.tsx.snap
+++ b/src/renderer/components/+namespaces/__snapshots__/namespace-select-filter.test.tsx.snap
@@ -172,7 +172,7 @@ exports[`<NamespaceSelectFilter /> when clicked renders 1`] = `
     </div>
   </div>
   <div
-    class="Select__menu-portal css-yj2v5g"
+    class="Select__menu-portal css-1no2yl0-MenuPortal"
   >
     <div
       class="NamespaceSelectFilterMenu theme-dark namespace-select-filter-options Select__menu css-26l3qy-menu"
@@ -822,7 +822,7 @@ exports[`<NamespaceSelectFilter /> when clicked when 'test-2' is clicked when cl
     </div>
   </div>
   <div
-    class="Select__menu-portal css-yj2v5g"
+    class="Select__menu-portal css-1no2yl0-MenuPortal"
   >
     <div
       class="NamespaceSelectFilterMenu theme-dark namespace-select-filter-options Select__menu css-26l3qy-menu"
@@ -1340,7 +1340,7 @@ exports[`<NamespaceSelectFilter /> when clicked when 'test-2' is clicked when cl
     </div>
   </div>
   <div
-    class="Select__menu-portal css-yj2v5g"
+    class="Select__menu-portal css-1no2yl0-MenuPortal"
   >
     <div
       class="NamespaceSelectFilterMenu theme-dark namespace-select-filter-options Select__menu css-26l3qy-menu"
diff --git a/src/renderer/components/+namespaces/namespace-details.tsx b/src/renderer/components/+namespaces/namespace-details.tsx
index 12bb7a4208..a11d7f26a5 100644
--- a/src/renderer/components/+namespaces/namespace-details.tsx
+++ b/src/renderer/components/+namespaces/namespace-details.tsx
@@ -10,7 +10,7 @@ import { computed, makeObservable, observable, reaction } from "mobx";
 import { disposeOnUnmount, observer } from "mobx-react";
 import { DrawerItem } from "../drawer";
 import { cssNames } from "../../utils";
-import { getMetricsForNamespace, type PodMetricData, Namespace } from "../../../common/k8s-api/endpoints";
+import { Namespace } from "../../../common/k8s-api/endpoints";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { Link } from "react-router-dom";
 import { Spinner } from "../spinner";
@@ -31,6 +31,8 @@ import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-activ
 import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
 import limitRangeStoreInjectable from "../+config-limit-ranges/store.injectable";
 import resourceQuotaStoreInjectable from "../+config-resource-quotas/store.injectable";
+import type { PodMetricInNamespaceData, RequestPodMetricsInNamespace } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-in-namespace.injectable";
+import requestPodMetricsInNamespaceInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-in-namespace.injectable";
 
 export interface NamespaceDetailsProps extends KubeObjectDetailsProps<Namespace> {
 }
@@ -41,11 +43,12 @@ interface Dependencies {
   getDetailsUrl: GetDetailsUrl;
   resourceQuotaStore: ResourceQuotaStore;
   limitRangeStore: LimitRangeStore;
+  requestPodMetricsInNamespace: RequestPodMetricsInNamespace;
 }
 
 @observer
 class NonInjectedNamespaceDetails extends React.Component<NamespaceDetailsProps & Dependencies> {
-  @observable metrics: PodMetricData | null = null;
+  @observable metrics: PodMetricInNamespaceData | null = null;
 
   constructor(props: NamespaceDetailsProps & Dependencies) {
     super(props);
@@ -78,7 +81,7 @@ class NonInjectedNamespaceDetails extends React.Component<NamespaceDetailsProps
   }
 
   loadMetrics = async () => {
-    this.metrics = await getMetricsForNamespace(this.props.object.getName(), "");
+    this.metrics = await this.props.requestPodMetricsInNamespace(this.props.object.getName());
   };
 
   render() {
@@ -144,6 +147,7 @@ export const NamespaceDetails = withInjectables<Dependencies, NamespaceDetailsPr
     getDetailsUrl: di.inject(getDetailsUrlInjectable),
     limitRangeStore: di.inject(limitRangeStoreInjectable),
     resourceQuotaStore: di.inject(resourceQuotaStoreInjectable),
+    requestPodMetricsInNamespace: di.inject(requestPodMetricsInNamespaceInjectable),
   }),
 });
 
diff --git a/src/renderer/components/+namespaces/route.tsx b/src/renderer/components/+namespaces/route.tsx
index 4bcc59041b..1ef8856348 100644
--- a/src/renderer/components/+namespaces/route.tsx
+++ b/src/renderer/components/+namespaces/route.tsx
@@ -6,7 +6,6 @@
 import "./namespaces.scss";
 
 import React from "react";
-import { NamespaceStatusKind } from "../../../common/k8s-api/endpoints";
 import { AddNamespaceDialog } from "./add-dialog/dialog";
 import { TabLayout } from "../layout/tab-layout-2";
 import { Badge } from "../badge";
@@ -72,9 +71,6 @@ export const NonInjectedNamespacesRoute = ({ namespaceStore, openAddNamespaceDia
         addTooltip: "Add Namespace",
         onAdd: openAddNamespaceDialog,
       }}
-      customizeTableRowProps={item => ({
-        disabled: item.getStatus() === NamespaceStatusKind.TERMINATING,
-      })}
     />
     <AddNamespaceDialog/>
   </TabLayout>
diff --git a/src/renderer/components/+network-ingresses/ingress-details.tsx b/src/renderer/components/+network-ingresses/ingress-details.tsx
index ae4c06b6d8..e8b916cac2 100644
--- a/src/renderer/components/+network-ingresses/ingress-details.tsx
+++ b/src/renderer/components/+network-ingresses/ingress-details.tsx
@@ -16,19 +16,26 @@ import { ResourceMetrics } from "../resource-metrics";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { IngressCharts } from "./ingress-charts";
 import { KubeObjectMeta } from "../kube-object-meta";
-import { computeRuleDeclarations, getMetricsForIngress, type IngressMetricData } from "../../../common/k8s-api/endpoints/ingress.api";
+import { computeRuleDeclarations } from "../../../common/k8s-api/endpoints/ingress.api";
 import { getActiveClusterEntity } from "../../api/catalog/entity/legacy-globals";
 import { ClusterMetricsResourceType } from "../../../common/cluster-types";
 import logger from "../../../common/logger";
+import type { IngressMetricData, RequestIngressMetrics } from "../../../common/k8s-api/endpoints/metrics.api/request-ingress-metrics.injectable";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import requestIngressMetricsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-ingress-metrics.injectable";
 
 export interface IngressDetailsProps extends KubeObjectDetailsProps<Ingress> {
 }
 
+interface Dependencies {
+  requestIngressMetrics: RequestIngressMetrics;
+}
+
 @observer
-export class IngressDetails extends React.Component<IngressDetailsProps> {
+class NonInjectedIngressDetails extends React.Component<IngressDetailsProps & Dependencies> {
   @observable metrics: IngressMetricData | null = null;
 
-  constructor(props: IngressDetailsProps) {
+  constructor(props: IngressDetailsProps & Dependencies) {
     super(props);
     makeObservable(this);
   }
@@ -42,9 +49,9 @@ export class IngressDetails extends React.Component<IngressDetailsProps> {
   }
 
   loadMetrics = async () => {
-    const { object: ingress } = this.props;
+    const { object: ingress, requestIngressMetrics } = this.props;
 
-    this.metrics = await getMetricsForIngress(ingress.getName(), ingress.getNs());
+    this.metrics = await requestIngressMetrics(ingress.getName(), ingress.getNs());
   };
 
   renderPaths(ingress: Ingress) {
@@ -170,3 +177,10 @@ export class IngressDetails extends React.Component<IngressDetailsProps> {
     );
   }
 }
+
+export const IngressDetails = withInjectables<Dependencies, IngressDetailsProps>(NonInjectedIngressDetails, {
+  getProps: (di, props) => ({
+    ...props,
+    requestIngressMetrics: di.inject(requestIngressMetricsInjectable),
+  }),
+});
diff --git a/src/renderer/components/+nodes/details.tsx b/src/renderer/components/+nodes/details.tsx
index 3377bcb4a5..f71d5bfa5f 100644
--- a/src/renderer/components/+nodes/details.tsx
+++ b/src/renderer/components/+nodes/details.tsx
@@ -13,8 +13,7 @@ import { DrawerItem, DrawerItemLabels } from "../drawer";
 import { Badge } from "../badge";
 import { ResourceMetrics } from "../resource-metrics";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
-import type { ClusterMetricData } from "../../../common/k8s-api/endpoints";
-import { formatNodeTaint, getMetricsByNodeNames, Node } from "../../../common/k8s-api/endpoints";
+import { formatNodeTaint, Node } from "../../../common/k8s-api/endpoints";
 import { NodeCharts } from "./node-charts";
 import { makeObservable, observable, reaction } from "mobx";
 import { PodDetailsList } from "../+workloads-pods/pod-details-list";
@@ -30,6 +29,8 @@ import type { PodStore } from "../+workloads-pods/store";
 import podStoreInjectable from "../+workloads-pods/store.injectable";
 import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable";
 import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable";
+import type { ClusterMetricData, RequestClusterMetricsByNodeNames } from "../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable";
+import requestClusterMetricsByNodeNamesInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable";
 
 export interface NodeDetailsProps extends KubeObjectDetailsProps<Node> {
 }
@@ -38,11 +39,12 @@ interface Dependencies {
   subscribeStores: SubscribeStores;
   podStore: PodStore;
   getActiveClusterEntity: GetActiveClusterEntity;
+  requestClusterMetricsByNodeNames: RequestClusterMetricsByNodeNames;
 }
 
 @observer
 class NonInjectedNodeDetails extends React.Component<NodeDetailsProps & Dependencies> {
-  @observable metrics: Partial<ClusterMetricData> | null = null;
+  @observable metrics: ClusterMetricData | null = null;
 
   constructor(props: NodeDetailsProps & Dependencies) {
     super(props);
@@ -62,9 +64,9 @@ class NonInjectedNodeDetails extends React.Component<NodeDetailsProps & Dependen
   }
 
   loadMetrics = async () => {
-    const { object: node } = this.props;
+    const { object: node, requestClusterMetricsByNodeNames } = this.props;
 
-    this.metrics = await getMetricsByNodeNames([node.getName()]);
+    this.metrics = await requestClusterMetricsByNodeNames([node.getName()]);
   };
 
   render() {
@@ -196,6 +198,7 @@ export const NodeDetails = withInjectables<Dependencies, NodeDetailsProps>(NonIn
     subscribeStores: di.inject(subscribeStoresInjectable),
     podStore: di.inject(podStoreInjectable),
     getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable),
+    requestClusterMetricsByNodeNames: di.inject(requestClusterMetricsByNodeNamesInjectable),
   }),
 });
 
diff --git a/src/renderer/components/+nodes/route.tsx b/src/renderer/components/+nodes/route.tsx
index 782d4808e6..a868dda39b 100644
--- a/src/renderer/components/+nodes/route.tsx
+++ b/src/renderer/components/+nodes/route.tsx
@@ -8,10 +8,9 @@ import React from "react";
 import { observer } from "mobx-react";
 import { cssNames, interval } from "../../utils";
 import { TabLayout } from "../layout/tab-layout-2";
-import { nodeStore } from "./legacy-store";
 import { KubeObjectListLayout } from "../kube-object-list-layout";
-import type { NodeMetricData, Node } from "../../../common/k8s-api/endpoints/node.api";
-import { formatNodeTaint, getMetricsForAllNodes } from "../../../common/k8s-api/endpoints/node.api";
+import type { Node } from "../../../common/k8s-api/endpoints/node.api";
+import { formatNodeTaint } from "../../../common/k8s-api/endpoints/node.api";
 import { LineProgress } from "../line-progress";
 import { bytesToUnits } from "../../../common/utils/convertMemory";
 import { Tooltip, TooltipPosition } from "../tooltip";
@@ -19,10 +18,15 @@ import kebabCase from "lodash/kebabCase";
 import upperFirst from "lodash/upperFirst";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import { Badge } from "../badge/badge";
-import { eventStore } from "../+events/legacy-store";
 import { makeObservable, observable } from "mobx";
-import isEmpty from "lodash/isEmpty";
 import { KubeObjectAge } from "../kube-object/age";
+import type { NodeMetricData, RequestAllNodeMetrics } from "../../../common/k8s-api/endpoints/metrics.api/request-metrics-for-all-nodes.injectable";
+import type { NodeStore } from "./store";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import nodeStoreInjectable from "./store.injectable";
+import requestAllNodeMetricsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-metrics-for-all-nodes.injectable";
+import eventStoreInjectable from "../+events/store.injectable";
+import type { EventStore } from "../+events/store";
 
 enum columnId {
   name = "name",
@@ -42,16 +46,23 @@ type MetricsTooltipFormatter = (metrics: [number, number]) => string;
 interface UsageArgs {
   node: Node;
   title: string;
-  metricNames: [string, string];
+  metricNames: [keyof NodeMetricData, keyof NodeMetricData];
   formatters: MetricsTooltipFormatter[];
 }
 
-@observer
-export class NodesRoute extends React.Component {
-  @observable.ref metrics: Partial<NodeMetricData> = {};
-  private metricsWatcher = interval(30, async () => this.metrics = await getMetricsForAllNodes());
+interface Dependencies {
+  requestAllNodeMetrics: RequestAllNodeMetrics;
+  nodeStore: NodeStore;
+  eventStore: EventStore;
+}
 
-  constructor(props: any) {
+@observer
+class NonInjectedNodesRoute extends React.Component<Dependencies> {
+  @observable metrics: NodeMetricData | null = null;
+
+  private metricsWatcher = interval(30, async () => this.metrics = await this.props.requestAllNodeMetrics());
+
+  constructor(props: Dependencies) {
     super(props);
     makeObservable(this);
   }
@@ -64,8 +75,8 @@ export class NodesRoute extends React.Component {
     this.metricsWatcher.stop();
   }
 
-  getLastMetricValues(node: Node, metricNames: string[]): number[] {
-    if (isEmpty(this.metrics)) {
+  getLastMetricValues(node: Node, metricNames: (keyof NodeMetricData)[]): number[] {
+    if (!this.metrics) {
       return [];
     }
 
@@ -73,7 +84,7 @@ export class NodesRoute extends React.Component {
 
     return metricNames.map(metricName => {
       try {
-        const metric = this.metrics[metricName];
+        const metric = this.metrics?.[metricName];
         const result = metric?.data.result.find(({ metric: { node, instance, kubernetes_node }}) => (
           nodeName === node
           || nodeName === instance
@@ -175,6 +186,8 @@ export class NodesRoute extends React.Component {
   }
 
   render() {
+    const { nodeStore, eventStore } = this.props;
+
     return (
       <TabLayout>
         <KubeObjectListLayout
@@ -251,3 +264,12 @@ export class NodesRoute extends React.Component {
     );
   }
 }
+
+export const NodesRoute = withInjectables<Dependencies>(NonInjectedNodesRoute, {
+  getProps: (di, props) => ({
+    ...props,
+    nodeStore: di.inject(nodeStoreInjectable),
+    eventStore: di.inject(eventStoreInjectable),
+    requestAllNodeMetrics: di.inject(requestAllNodeMetricsInjectable),
+  }),
+});
diff --git a/src/renderer/components/+preferences/app-preferences-route-component.injectable.ts b/src/renderer/components/+preferences/app-preferences-route-component.injectable.ts
deleted file mode 100644
index aa887c2df9..0000000000
--- a/src/renderer/components/+preferences/app-preferences-route-component.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { routeSpecificComponentInjectionToken } from "../../routes/route-specific-component-injection-token";
-import appPreferencesRouteInjectable from "../../../common/front-end-routing/routes/preferences/app/app-preferences-route.injectable";
-import { Application } from "./application";
-
-const appPreferencesRouteComponentInjectable = getInjectable({
-  id: "app-preferences-route-component",
-
-  instantiate: (di) => ({
-    route: di.inject(appPreferencesRouteInjectable),
-    Component: Application,
-  }),
-
-  injectionToken: routeSpecificComponentInjectionToken,
-});
-
-export default appPreferencesRouteComponentInjectable;
diff --git a/src/renderer/components/+preferences/app-preferences/app-preferences.injectable.ts b/src/renderer/components/+preferences/app-preferences/app-preferences.injectable.ts
deleted file mode 100644
index 83492ad22c..0000000000
--- a/src/renderer/components/+preferences/app-preferences/app-preferences.injectable.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { getInjectable } from "@ogre-tools/injectable";
-import rendererExtensionsInjectable from "../../../../extensions/renderer-extensions.injectable";
-import { getAppPreferences } from "./get-app-preferences";
-
-const appPreferencesInjectable = getInjectable({
-  id: "app-preferences",
-
-  instantiate: (di) =>
-    getAppPreferences({
-      extensions: di.inject(rendererExtensionsInjectable),
-    }),
-});
-
-export default appPreferencesInjectable;
diff --git a/src/renderer/components/+preferences/app-preferences/get-app-preferences.ts b/src/renderer/components/+preferences/app-preferences/get-app-preferences.ts
deleted file mode 100644
index b0befb011e..0000000000
--- a/src/renderer/components/+preferences/app-preferences/get-app-preferences.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { IComputedValue } from "mobx";
-import { computed } from "mobx";
-import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension";
-import type { AppPreferenceRegistration, RegisteredAppPreference } from "./app-preference-registration";
-
-interface Dependencies {
-  extensions: IComputedValue<LensRendererExtension[]>;
-}
-
-function getRegisteredItem(item: AppPreferenceRegistration): RegisteredAppPreference {
-  return {
-    id: item.id || item.title.toLowerCase().replace(/[^0-9a-zA-Z]+/g, "-"),
-    ...item,
-  };
-}
-
-
-export const getAppPreferences = ({ extensions }: Dependencies) => {
-  return computed(() => (
-    extensions.get()
-      .flatMap((extension) => extension.appPreferences)
-      .map(getRegisteredItem)
-  ));
-};
diff --git a/src/renderer/components/+preferences/application.tsx b/src/renderer/components/+preferences/application.tsx
deleted file mode 100644
index d3c0fd4414..0000000000
--- a/src/renderer/components/+preferences/application.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import React from "react";
-import { observer } from "mobx-react";
-import { SubTitle } from "../layout/sub-title";
-import { Select } from "../select";
-import type { ThemeStore } from "../../themes/store";
-import type { UserStore } from "../../../common/user-store";
-import { Input } from "../input";
-import { Switch } from "../switch";
-import moment from "moment-timezone";
-import { defaultExtensionRegistryUrl, defaultLocaleTimezone, defaultExtensionRegistryUrlLocation } from "../../../common/user-store/preferences-helpers";
-import type { IComputedValue } from "mobx";
-import { runInAction } from "mobx";
-import { isUrl } from "../input/input_validators";
-import { ExtensionSettings } from "./extension-settings";
-import type { RegisteredAppPreference } from "./app-preferences/app-preference-registration";
-import { withInjectables } from "@ogre-tools/injectable-react";
-import appPreferencesInjectable from "./app-preferences/app-preferences.injectable";
-import { Preferences } from "./preferences";
-import userStoreInjectable from "../../../common/user-store/user-store.injectable";
-import themeStoreInjectable from "../../themes/store.injectable";
-import { defaultThemeId } from "../../../common/vars";
-import { updateChannels } from "../../../common/application-update/update-channels";
-import { map, toPairs } from "lodash/fp";
-import { pipeline } from "@ogre-tools/fp";
-import type { SelectedUpdateChannel } from "../../../common/application-update/selected-update-channel/selected-update-channel.injectable";
-import selectedUpdateChannelInjectable from "../../../common/application-update/selected-update-channel/selected-update-channel.injectable";
-
-interface Dependencies {
-  appPreferenceItems: IComputedValue<RegisteredAppPreference[]>;
-  userStore: UserStore;
-  themeStore: ThemeStore;
-  selectedUpdateChannel: SelectedUpdateChannel;
-}
-
-const timezoneOptions = moment.tz.names()
-  .map(timezone => ({
-    value: timezone,
-    label: timezone.replace("_", " "),
-  }));
-
-const updateChannelOptions = pipeline(
-  toPairs(updateChannels),
-
-  map(([, channel]) => ({
-    value: channel.id,
-    label: channel.label,
-  })),
-);
-
-const extensionInstallRegistryOptions = [
-  {
-    value: "default",
-    label: "Default Url",
-  },
-  {
-    value: "npmrc",
-    label: "Global .npmrc file's Url",
-  },
-  {
-    value: "custom",
-    label: "Custom Url",
-  },
-] as const;
-
-const NonInjectedApplication: React.FC<Dependencies> = ({ appPreferenceItems, userStore, themeStore, selectedUpdateChannel }) => {
-  const [customUrl, setCustomUrl] = React.useState(userStore.extensionRegistryUrl.customUrl || "");
-  const themeOptions = [
-    {
-      value: "system", // TODO: replace with a sentinal value that isn't string (and serialize it differently)
-      label: "Sync with computer",
-    },
-    ...Array.from(themeStore.themes, ([themeId, { name }]) => ({
-      value: themeId,
-      label: name,
-    })),
-  ];
-  const extensionSettings = appPreferenceItems.get()
-    .filter((preference) => preference.showInPreferencesTab === "application");
-
-  return (
-    <Preferences data-testid="application-preferences-page">
-      <section id="application">
-        <h2 data-testid="application-header">Application</h2>
-        <section id="appearance">
-          <SubTitle title="Theme" />
-          <Select
-            id="theme-input"
-            options={themeOptions}
-            value={userStore.colorTheme}
-            onChange={value => userStore.colorTheme = value?.value ?? defaultThemeId}
-            themeName="lens"
-          />
-        </section>
-
-        <hr/>
-
-        <section id="extensionRegistryUrl">
-          <SubTitle title="Extension Install Registry" />
-          <Select
-            id="extension-install-registry-input"
-            options={extensionInstallRegistryOptions}
-            value={userStore.extensionRegistryUrl.location}
-            onChange={value => runInAction(() => {
-              userStore.extensionRegistryUrl.location = value?.value ?? defaultExtensionRegistryUrlLocation;
-
-              if (userStore.extensionRegistryUrl.location === "custom") {
-                userStore.extensionRegistryUrl.customUrl = "";
-              }
-            })}
-            themeName="lens"
-          />
-          <p className="mt-4 mb-5 leading-relaxed">
-            {"This setting is to change the registry URL for installing extensions by name. "}
-            {`If you are unable to access the default registry (${defaultExtensionRegistryUrl}) you can change it in your `}
-            <b>.npmrc</b>
-            {" file or in the input below."}
-          </p>
-
-          <Input
-            theme="round-black"
-            validators={isUrl}
-            value={customUrl}
-            onChange={setCustomUrl}
-            onBlur={() => userStore.extensionRegistryUrl.customUrl = customUrl}
-            placeholder="Custom Extension Registry URL..."
-            disabled={userStore.extensionRegistryUrl.location !== "custom"}
-          />
-        </section>
-
-        <hr />
-
-        <section id="other">
-          <SubTitle title="Start-up" />
-          <Switch checked={userStore.openAtLogin} onChange={() => userStore.openAtLogin = !userStore.openAtLogin}>
-            Automatically start Lens on login
-          </Switch>
-        </section>
-
-        <hr />
-
-        {extensionSettings.map(setting => (
-          <ExtensionSettings
-            key={setting.id}
-            setting={setting}
-            size="normal"
-          />
-        ))}
-
-        <section id="update-channel">
-          <SubTitle title="Update Channel" />
-          <Select
-            id="update-channel-input"
-            options={updateChannelOptions}
-            value={selectedUpdateChannel.value.get().id}
-            onChange={(selected) => selectedUpdateChannel.setValue(selected?.value) }
-            themeName="lens"
-          />
-        </section>
-
-        <hr />
-
-        <section id="locale">
-          <SubTitle title="Locale Timezone" />
-          <Select
-            id="timezone-input"
-            options={timezoneOptions}
-            value={userStore.localeTimezone}
-            onChange={value => userStore.localeTimezone = value?.value ?? defaultLocaleTimezone}
-            themeName="lens"
-          />
-        </section>
-      </section>
-    </Preferences>
-  );
-};
-
-export const Application = withInjectables<Dependencies>(
-  observer(NonInjectedApplication),
-
-  {
-    getProps: (di) => ({
-      appPreferenceItems: di.inject(appPreferencesInjectable),
-      userStore: di.inject(userStoreInjectable),
-      themeStore: di.inject(themeStoreInjectable),
-      selectedUpdateChannel: di.inject(selectedUpdateChannelInjectable),
-    }),
-  },
-);
diff --git a/src/renderer/components/+preferences/editor-preferences-route-component.injectable.ts b/src/renderer/components/+preferences/editor-preferences-route-component.injectable.ts
deleted file mode 100644
index a51d95438b..0000000000
--- a/src/renderer/components/+preferences/editor-preferences-route-component.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { routeSpecificComponentInjectionToken } from "../../routes/route-specific-component-injection-token";
-import { Editor } from "./editor";
-import editorPreferencesRouteInjectable from "../../../common/front-end-routing/routes/preferences/editor/editor-preferences-route.injectable";
-
-const editorPreferencesRouteComponentInjectable = getInjectable({
-  id: "editor-preferences-route-component",
-
-  instantiate: (di) => ({
-    route: di.inject(editorPreferencesRouteInjectable),
-    Component: Editor,
-  }),
-
-  injectionToken: routeSpecificComponentInjectionToken,
-});
-
-export default editorPreferencesRouteComponentInjectable;
diff --git a/src/renderer/components/+preferences/editor.tsx b/src/renderer/components/+preferences/editor.tsx
deleted file mode 100644
index 4405dc949c..0000000000
--- a/src/renderer/components/+preferences/editor.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { observer } from "mobx-react";
-import React from "react";
-import type { UserStore } from "../../../common/user-store";
-import { Switch } from "../switch";
-import { Select } from "../select";
-import { SubTitle } from "../layout/sub-title";
-import { SubHeader } from "../layout/sub-header";
-import { Input, InputValidators } from "../input";
-import { Preferences } from "./preferences";
-import { withInjectables } from "@ogre-tools/injectable-react";
-import userStoreInjectable from "../../../common/user-store/user-store.injectable";
-import { defaultEditorConfig } from "../../../common/user-store/preferences-helpers";
-import { capitalize } from "lodash";
-
-interface Dependencies {
-  userStore: UserStore;
-}
-
-const minimapPositionOptions = (["left", "right"] as const)
-  .map(side => ({
-    value: side,
-    label: side,
-  }));
-const lineNumberOptions = ([
-  "on",
-  "off",
-  "relative",
-  "interval",
-] as const).map(lineNumbers => ({
-  value: lineNumbers,
-  label: capitalize(lineNumbers),
-}));
-
-const NonInjectedEditor = observer(({ userStore }: Dependencies) => {
-  const editorConfiguration = userStore.editorConfiguration;
-
-  return (
-    <Preferences data-testid="editor-preferences-page">
-      <section id="editor">
-        <h2 data-testid="editor-configuration-header">Editor configuration</h2>
-
-        <SubTitle title="Minimap"/>
-        <section>
-          <div className="flex gaps justify-space-between">
-            <div className="flex gaps align-center">
-              <Switch
-                checked={editorConfiguration.minimap.enabled}
-                onChange={() => editorConfiguration.minimap.enabled = !editorConfiguration.minimap.enabled}
-              >
-                Show minimap
-              </Switch>
-            </div>
-            <div className="flex gaps align-center">
-              <SubHeader compact>Position</SubHeader>
-              <Select
-                id="minimap-input"
-                themeName="lens"
-                options={minimapPositionOptions}
-                value={editorConfiguration.minimap.side}
-                onChange={option => editorConfiguration.minimap.side = option?.value}
-              />
-            </div>
-          </div>
-        </section>
-
-        <section>
-          <SubTitle title="Line numbers"/>
-          <Select
-            id="editor-line-numbers-input"
-            options={lineNumberOptions}
-            value={editorConfiguration.lineNumbers}
-            onChange={option => editorConfiguration.lineNumbers = option?.value ?? defaultEditorConfig.lineNumbers}
-            themeName="lens"
-          />
-        </section>
-
-        <section>
-          <SubTitle title="Tab size" />
-          <Input
-            theme="round-black"
-            type="number"
-            min={1}
-            validators={InputValidators.isNumber}
-            value={editorConfiguration.tabSize.toString()}
-            onChange={value => editorConfiguration.tabSize = Number(value)}
-          />
-        </section>
-        <section>
-          <SubTitle title="Font size" />
-          <Input
-            theme="round-black"
-            type="number"
-            min={10}
-            validators={InputValidators.isNumber}
-            value={editorConfiguration.fontSize.toString()}
-            onChange={value => editorConfiguration.fontSize = Number(value)}
-          />
-        </section>
-        <section>
-          <SubTitle title="Font family" />
-          <Input
-            theme="round-black"
-            type="text"
-            value={editorConfiguration.fontFamily}
-            onChange={value => editorConfiguration.fontFamily = value}
-          />
-        </section>
-      </section>
-    </Preferences>
-  );
-});
-
-export const Editor = withInjectables<Dependencies>(
-  NonInjectedEditor,
-
-  {
-    getProps: (di) => ({
-      userStore: di.inject(userStoreInjectable),
-    }),
-  },
-);
-
-
diff --git a/src/renderer/components/+preferences/extension-preference-item-registrator.injectable.ts b/src/renderer/components/+preferences/extension-preference-item-registrator.injectable.ts
deleted file mode 100644
index 8182cfd2af..0000000000
--- a/src/renderer/components/+preferences/extension-preference-item-registrator.injectable.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { filter, map } from "lodash/fp";
-import { extensionRegistratorInjectionToken } from "../../../extensions/extension-loader/extension-registrator-injection-token";
-import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension";
-import { pipeline } from "@ogre-tools/fp";
-import { extensionPreferenceItemInjectionToken } from "./extension-preference-items-injection-token";
-
-const extensionPreferenceItemRegistratorInjectable = getInjectable({
-  id: "extension-preference-item-registrator",
-
-  instantiate:
-    () =>
-      (ext) => {
-        const extension = ext as LensRendererExtension;
-
-        return pipeline(
-          extension.appPreferences,
-
-          filter(
-            (registration) => !registration.showInPreferencesTab,
-          ),
-
-          map((registration) => {
-            const id = `extension-preferences-item-${registration.id}-for-extension-${extension.sanitizedExtensionId}`;
-
-            return getInjectable({
-              id,
-              injectionToken: extensionPreferenceItemInjectionToken,
-
-              instantiate: () => ({
-                id: registration.id || id,
-                title: registration.title,
-                extension,
-
-                components: {
-                  Hint: registration.components.Hint,
-                  Input: registration.components.Input,
-                },
-              }),
-            });
-          }),
-        );
-      },
-
-  injectionToken: extensionRegistratorInjectionToken,
-});
-
-export default extensionPreferenceItemRegistratorInjectable;
diff --git a/src/renderer/components/+preferences/extension-preference-items-injection-token.ts b/src/renderer/components/+preferences/extension-preference-items-injection-token.ts
deleted file mode 100644
index 6c634f60da..0000000000
--- a/src/renderer/components/+preferences/extension-preference-items-injection-token.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { getInjectionToken } from "@ogre-tools/injectable";
-import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension";
-import type { RegisteredAppPreference } from "./app-preferences/app-preference-registration";
- 
- interface ExtensionPreferenceItem extends RegisteredAppPreference {
-   extension: LensRendererExtension;
- }
- 
-export const extensionPreferenceItemInjectionToken = getInjectionToken<ExtensionPreferenceItem>({
-  id: "extension-preference-item-injection-token",
-});
- 
diff --git a/src/renderer/components/+preferences/extension-preference-items.injectable.ts b/src/renderer/components/+preferences/extension-preference-items.injectable.ts
deleted file mode 100644
index 5143ee60c9..0000000000
--- a/src/renderer/components/+preferences/extension-preference-items.injectable.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable, getInjectionToken } from "@ogre-tools/injectable";
-import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
-import type { RegisteredAppPreference } from "./app-preferences/app-preference-registration";
-
-export const extensionPreferenceItemInjectionToken = getInjectionToken<RegisteredAppPreference>({
-  id: "extension-preference-item-injection-token",
-});
-
-const extensionsPreferenceItemsInjectable = getInjectable({
-  id: "extension-preference-items",
-
-  instantiate: (di) => {
-    const computedInjectMany = di.inject(computedInjectManyInjectable);
-
-    return computedInjectMany(extensionPreferenceItemInjectionToken);
-  },
-});
-
-export default extensionsPreferenceItemsInjectable;
diff --git a/src/renderer/components/+preferences/extension-preference-model.injectable.ts b/src/renderer/components/+preferences/extension-preference-model.injectable.ts
deleted file mode 100644
index ee87b5dcdf..0000000000
--- a/src/renderer/components/+preferences/extension-preference-model.injectable.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { computed } from "mobx";
-import extensionPreferencesRouteInjectable from "../../../common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable";
-import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable";
-import routePathParametersInjectable from "../../routes/route-path-parameters.injectable";
-import { getExtensionPreferenceItems } from "./get-extension-preference-items";
-
-const extensionPreferencesModelInjectable = getInjectable({
-  id: "extension-preferences-model",
-
-  instantiate: (di) => {
-    const route = di.inject(extensionPreferencesRouteInjectable);
-    const pathParameters = di.inject(routePathParametersInjectable, route);
-    const extensions = di.inject(rendererExtensionsInjectable);
-
-    return computed(() => {
-      const { extensionId, tabId } = pathParameters.get();
-      const targetExtension = extensions.get().find((extension) => extension.sanitizedExtensionId === extensionId);
-      const targetAppTab = targetExtension?.appPreferenceTabs.find(tab => tab.id === tabId);
-      const preferencePageTitle = targetAppTab?.title || `${targetExtension?.manifest.name || "Extension"} preferences`;
-
-      return {
-        extensionName: targetExtension?.manifest.name,
-        preferenceItems: getExtensionPreferenceItems(targetExtension, tabId),
-        preferencePageTitle,
-      };
-    });
-  },
-});
-
-export default extensionPreferencesModelInjectable;
diff --git a/src/renderer/components/+preferences/extension-preferences-route-component.injectable.ts b/src/renderer/components/+preferences/extension-preferences-route-component.injectable.ts
deleted file mode 100644
index f67e94fd98..0000000000
--- a/src/renderer/components/+preferences/extension-preferences-route-component.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { routeSpecificComponentInjectionToken } from "../../routes/route-specific-component-injection-token";
-import extensionPreferencesRouteInjectable from "../../../common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable";
-import { Extensions } from "./extensions";
-
-const extensionPreferencesRouteComponentInjectable = getInjectable({
-  id: "extension-preferences-route-component",
-
-  instantiate: (di) => ({
-    route: di.inject(extensionPreferencesRouteInjectable),
-    Component: Extensions,
-  }),
-
-  injectionToken: routeSpecificComponentInjectionToken,
-});
-
-export default extensionPreferencesRouteComponentInjectable;
diff --git a/src/renderer/components/+preferences/extension-telemetry-preference-item-registrator.injectable.ts b/src/renderer/components/+preferences/extension-telemetry-preference-item-registrator.injectable.ts
deleted file mode 100644
index f6a3900675..0000000000
--- a/src/renderer/components/+preferences/extension-telemetry-preference-item-registrator.injectable.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { filter, map } from "lodash/fp";
-import { extensionRegistratorInjectionToken } from "../../../extensions/extension-loader/extension-registrator-injection-token";
-import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension";
-import { pipeline } from "@ogre-tools/fp";
-import { telemetryPreferenceItemInjectionToken } from "./telemetry-preference-items.injectable";
-
-const extensionTelemetryPreferenceItemRegistratorInjectable = getInjectable({
-  id: "extension-telemetry-preference-item-registrator",
-
-  instantiate:
-    () =>
-      (ext) => {
-        const extension = ext as LensRendererExtension;
-
-        return pipeline(
-          extension.appPreferences,
-
-          filter(
-            (registration) => registration.showInPreferencesTab === "telemetry",
-          ),
-
-          map((registration) => {
-            const id = `telemetry-preferences-item-${registration.id}-for-extension-${extension.sanitizedExtensionId}`;
-
-            return getInjectable({
-              id,
-              injectionToken: telemetryPreferenceItemInjectionToken,
-
-              instantiate: () => ({
-                id: registration.id || id,
-                title: registration.title,
-
-                components: {
-                  Hint: registration.components.Hint,
-                  Input: registration.components.Input,
-                },
-              }),
-            });
-          }),
-        );
-      },
-
-  injectionToken: extensionRegistratorInjectionToken,
-});
-
-export default extensionTelemetryPreferenceItemRegistratorInjectable;
diff --git a/src/renderer/components/+preferences/extensions.tsx b/src/renderer/components/+preferences/extensions.tsx
deleted file mode 100644
index 3b7fe7f343..0000000000
--- a/src/renderer/components/+preferences/extensions.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { withInjectables } from "@ogre-tools/injectable-react";
-import type { IComputedValue } from "mobx";
-import { observer } from "mobx-react";
-import React from "react";
-import type { RegisteredAppPreference } from "./app-preferences/app-preference-registration";
-import extensionPreferencesModelInjectable from "./extension-preference-model.injectable";
-import { ExtensionSettings } from "./extension-settings";
-import { Preferences } from "./preferences";
-
-interface Dependencies {
-  model: IComputedValue<{
-    preferenceItems: RegisteredAppPreference[];
-    extensionName?: string;
-    preferencePageTitle?: string;
-  }>;
-}
-
-const NonInjectedExtensions = ({ model }: Dependencies) => {
-  const { extensionName, preferenceItems, preferencePageTitle } = model.get();
-
-  return (
-    <Preferences data-testid="extension-preferences-page">
-      <section id="extensions">
-        <h2 data-testid="extension-preferences-page-title">
-          {preferencePageTitle}
-        </h2>
-        {!extensionName && (
-          <div
-            className="flex items-center"
-            data-testid="error-for-extension-not-being-present"
-          >
-            No extension found
-          </div>
-        )}
-        {preferenceItems.map((preferenceItem, index) => (
-          <ExtensionSettings
-            key={`${preferenceItem.id}-${index}`}
-            setting={preferenceItem}
-            size="small"
-            data-testid={`extension-preference-item-for-${preferenceItem.id}`}
-          />
-        ))}
-      </section>
-    </Preferences>
-  );
-};
-
-export const Extensions = withInjectables<Dependencies>(
-  observer(NonInjectedExtensions),
-
-  {
-    getProps: (di) => ({
-      model: di.inject(extensionPreferencesModelInjectable),
-    }),
-  },
-);
diff --git a/src/renderer/components/+preferences/get-extension-preference-items.ts b/src/renderer/components/+preferences/get-extension-preference-items.ts
deleted file mode 100644
index a9c2237d18..0000000000
--- a/src/renderer/components/+preferences/get-extension-preference-items.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension";
-import type { RegisteredAppPreference } from "./app-preferences/app-preference-registration";
-
-export function getExtensionPreferenceItems(extension?: LensRendererExtension, tabId?: string): RegisteredAppPreference[] {
-  if (!extension) {
-    return [];
-  }
-
-  const preferences = extension.appPreferences.map(preference => ({
-    id: preference.id || preference.title,
-    ...preference,
-  }));
-
-  if (tabId) {
-    return preferences.filter(preference => preference.showInPreferencesTab == tabId);
-  }
-
-  return preferences.filter(preference => !preference.showInPreferencesTab);
-}
diff --git a/src/renderer/components/+preferences/kubectl-binaries.tsx b/src/renderer/components/+preferences/kubectl-binaries.tsx
deleted file mode 100644
index 413a85f023..0000000000
--- a/src/renderer/components/+preferences/kubectl-binaries.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import React, { useState } from "react";
-import { observer } from "mobx-react";
-import { Input, InputValidators } from "../input";
-import { SubTitle } from "../layout/sub-title";
-import type { UserStore } from "../../../common/user-store";
-import { Select } from "../select";
-import { Switch } from "../switch";
-import { defaultPackageMirror, packageMirrors } from "../../../common/user-store/preferences-helpers";
-import directoryForBinariesInjectable from "../../../common/app-paths/directory-for-binaries/directory-for-binaries.injectable";
-import { withInjectables } from "@ogre-tools/injectable-react";
-import userStoreInjectable from "../../../common/user-store/user-store.injectable";
-import directoryForKubectlBinariesInjectable from "../../../common/app-paths/directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable";
-
-interface Dependencies {
-  defaultPathForGeneralBinaries: string;
-  defaultPathForKubectlBinaries: string;
-  userStore: UserStore;
-}
-const downloadMirrorOptions = Array.from(packageMirrors, ([name, mirror]) => ({
-  value: name,
-  label: mirror.label,
-  isDisabled: !mirror.platforms.has(process.platform),
-}));
-
-const NonInjectedKubectlBinaries= observer(({
-  defaultPathForGeneralBinaries,
-  defaultPathForKubectlBinaries,
-  userStore,
-}: Dependencies) => {
-  const [downloadPath, setDownloadPath] = useState(userStore.downloadBinariesPath || "");
-  const [binariesPath, setBinariesPath] = useState(userStore.kubectlBinariesPath || "");
-  const pathValidator = downloadPath ? InputValidators.isPath : undefined;
-
-  const save = () => {
-    userStore.downloadBinariesPath = downloadPath;
-    userStore.kubectlBinariesPath = binariesPath;
-  };
-
-  return (
-    <>
-      <section>
-        <SubTitle title="Kubectl binary download" />
-        <Switch
-          checked={userStore.downloadKubectlBinaries}
-          onChange={() => userStore.downloadKubectlBinaries = !userStore.downloadKubectlBinaries}
-        >
-          Download kubectl binaries matching the Kubernetes cluster version
-        </Switch>
-      </section>
-
-      <section>
-        <SubTitle title="Download mirror" />
-        <Select
-          id="download-mirror-input"
-          placeholder="Download mirror for kubectl"
-          options={downloadMirrorOptions}
-          value={userStore.downloadMirror}
-          onChange={option => userStore.downloadMirror = option?.value ?? defaultPackageMirror}
-          isDisabled={!userStore.downloadKubectlBinaries}
-          themeName="lens"
-        />
-      </section>
-
-      <section>
-        <SubTitle title="Directory for binaries" />
-        <Input
-          theme="round-black"
-          value={downloadPath}
-          placeholder={defaultPathForGeneralBinaries}
-          validators={pathValidator}
-          onChange={setDownloadPath}
-          onBlur={save}
-          disabled={!userStore.downloadKubectlBinaries}
-        />
-        <div className="hint">The directory to download binaries into.</div>
-      </section>
-
-      <section>
-        <SubTitle title="Path to kubectl binary" />
-        <Input
-          theme="round-black"
-          placeholder={defaultPathForKubectlBinaries}
-          value={binariesPath}
-          validators={pathValidator}
-          onChange={setBinariesPath}
-          onBlur={save}
-          disabled={userStore.downloadKubectlBinaries}
-        />
-      </section>
-    </>
-  );
-},
-);
-
-export const KubectlBinaries = withInjectables<Dependencies>(
-  NonInjectedKubectlBinaries,
-  {
-    getProps: (di) => ({
-      defaultPathForGeneralBinaries: di.inject(directoryForBinariesInjectable),
-      defaultPathForKubectlBinaries: di.inject(directoryForKubectlBinariesInjectable),
-      userStore: di.inject(userStoreInjectable),
-    }),
-  },
-);
diff --git a/src/renderer/components/+preferences/kubernetes-preferences-route-component.injectable.ts b/src/renderer/components/+preferences/kubernetes-preferences-route-component.injectable.ts
deleted file mode 100644
index 51c33f73a6..0000000000
--- a/src/renderer/components/+preferences/kubernetes-preferences-route-component.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { routeSpecificComponentInjectionToken } from "../../routes/route-specific-component-injection-token";
-import kubernetesPreferencesRouteInjectable from "../../../common/front-end-routing/routes/preferences/kubernetes/kubernetes-preferences-route.injectable";
-import { Kubernetes } from "./kubernetes";
-
-const kubernetesPreferencesRouteComponentInjectable = getInjectable({
-  id: "kubernetes-preferences-route-component",
-
-  instantiate: (di) => ({
-    route: di.inject(kubernetesPreferencesRouteInjectable),
-    Component: Kubernetes,
-  }),
-
-  injectionToken: routeSpecificComponentInjectionToken,
-});
-
-export default kubernetesPreferencesRouteComponentInjectable;
diff --git a/src/renderer/components/+preferences/kubernetes.tsx b/src/renderer/components/+preferences/kubernetes.tsx
deleted file mode 100644
index 5305743530..0000000000
--- a/src/renderer/components/+preferences/kubernetes.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { observer } from "mobx-react";
-import React from "react";
-import { HelmCharts } from "./kubernetes/helm-charts/helm-charts";
-import { KubeconfigSyncs } from "./kubeconfig-syncs";
-import { KubectlBinaries } from "./kubectl-binaries";
-import { Preferences } from "./preferences";
-
-export const Kubernetes = observer(() => (
-  <Preferences data-testid="kubernetes-preferences-page">
-    <section id="kubernetes">
-      <section id="kubectl">
-        <h2 data-testid="kubernetes-header">Kubernetes</h2>
-        <KubectlBinaries />
-      </section>
-      <hr />
-      <section id="kube-sync">
-        <h2 data-testid="kubernetes-sync-header">Kubeconfig Syncs</h2>
-        <KubeconfigSyncs />
-      </section>
-      <hr />
-      <section id="helm">
-        <h2>Helm Charts</h2>
-        <HelmCharts />
-      </section>
-    </section>
-  </Preferences>
-));
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/active-helm-repositories.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/active-helm-repositories.injectable.ts
deleted file mode 100644
index 94fdeaa393..0000000000
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/active-helm-repositories.injectable.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { asyncComputed } from "@ogre-tools/injectable-react";
-import getActiveHelmRepositoriesChannelInjectable from "../../../../../common/helm/get-active-helm-repositories-channel.injectable";
-import { requestFromChannelInjectionToken } from "../../../../../common/utils/channel/request-from-channel-injection-token";
-import showErrorNotificationInjectable from "../../../notifications/show-error-notification.injectable";
-import helmRepositoriesErrorStateInjectable from "./helm-repositories-error-state.injectable";
-import { runInAction } from "mobx";
-
-const activeHelmRepositoriesInjectable = getInjectable({
-  id: "active-helm-repositories",
-
-  instantiate: (di) => {
-    const requestFromChannel = di.inject(requestFromChannelInjectionToken);
-    const getHelmRepositoriesChannel = di.inject(getActiveHelmRepositoriesChannelInjectable);
-    const showErrorNotification = di.inject(showErrorNotificationInjectable);
-    const helmRepositoriesErrorState = di.inject(helmRepositoriesErrorStateInjectable);
-
-    return asyncComputed(async () => {
-      const result = await requestFromChannel(getHelmRepositoriesChannel);
-
-      if (result.callWasSuccessful) {
-        return result.response;
-      } else {
-        showErrorNotification(result.error);
-
-        runInAction(() =>
-          helmRepositoriesErrorState.set({
-            controlsAreShown: false,
-            errorMessage: result.error,
-          }),
-        );
-
-        return [];
-      }
-    }, []);
-  },
-});
-
-export default activeHelmRepositoriesInjectable;
diff --git a/src/renderer/components/+preferences/preferences-navigation/__tests__/preferences-navigation.test.tsx b/src/renderer/components/+preferences/preferences-navigation/__tests__/preferences-navigation.test.tsx
deleted file mode 100644
index 81244bcd24..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/__tests__/preferences-navigation.test.tsx
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import "@testing-library/jest-dom/extend-expect";
-import type { RenderResult } from "@testing-library/react";
-import { computed } from "mobx";
-import { noop } from "../../../../utils";
-import type { ApplicationBuilder } from "../../../test-utils/get-application-builder";
-import { getApplicationBuilder } from "../../../test-utils/get-application-builder";
-import type { PreferenceNavigationItem } from "../preference-navigation-items.injectable";
-import preferenceNavigationItemsInjectable from "../preference-navigation-items.injectable";
-
-describe.only("preferences - navigation block with links", () => {
-  let builder: ApplicationBuilder;
-
-  beforeEach(() => {
-    builder = getApplicationBuilder();
-  });
-
-  describe("given in preferences, when rendered", () => {
-    let renderer: RenderResult;
-
-    describe("when general navigation items passed", () => {
-      beforeEach(async () => {
-        builder.beforeWindowStart((windowDi) => {
-          windowDi.override(preferenceNavigationItemsInjectable, () =>
-            computed(() => generalNavItems),
-          );
-
-          builder.preferences.navigate();
-        });
-
-        renderer = await builder.render();
-      });
-
-      const links = ["General", "Proxy"];
-
-      it.each(links)("renders link with text content %s", (link) => {
-        expect(renderer.container).toHaveTextContent(link);
-      });
-
-      it("does not show custom settings block", () => {
-        expect(
-          renderer.queryByTestId("extension-settings"),
-        ).not.toBeInTheDocument();
-      });
-    });
-
-    describe("when general + extension navigation items passed", () => {
-      beforeEach(async () => {
-        builder.beforeWindowStart((windowDi) => {
-          windowDi.override(preferenceNavigationItemsInjectable, () =>
-            computed(() => [...generalNavItems, ...extensionNavItems]),
-          );
-
-          builder.preferences.navigate();
-        });
-
-        renderer = await builder.render();
-      });
-
-      const generalLinks = ["General", "Proxy"];
-
-      it.each(generalLinks)(
-        "renders general link with text content %s",
-        (link) => {
-          expect(renderer.container).toHaveTextContent(link);
-        },
-      );
-
-      it("shows custom settings block", () => {
-        expect(
-          renderer.queryByTestId("extension-settings"),
-        ).toBeInTheDocument();
-      });
-
-      const extensionLinks = ["lensapp-node-menu", "lensapp-pod-menu"];
-
-      it.each(extensionLinks)("shows extension navigation item %s", (link) => {
-        expect(
-          renderer.getByTestId(
-            `tab-link-for-extension-preferences-navigation-item-${link}`,
-          ),
-        ).toBeInTheDocument();
-      });
-
-      it("renders extension navigation items inside custom settings block", () => {
-        const settingsBlock = renderer.getByTestId("extension-settings");
-
-        expect(settingsBlock).toHaveTextContent("lensapp-node-menu");
-      });
-    });
-  });
-});
-
-const generalNavItems: PreferenceNavigationItem[] = [
-  {
-    id: "general",
-    label: "General",
-    isActive: computed(() => false),
-    isVisible: computed(() => true),
-    navigate: () => noop,
-    orderNumber: 0,
-    parent: "general",
-  },
-  {
-    id: "proxy",
-    label: "Proxy",
-    isActive: computed(() => false),
-    isVisible: computed(() => true),
-    navigate: () => noop,
-    orderNumber: 1,
-    parent: "general",
-  },
-];
-
-const extensionNavItems = [
-  {
-    id: "extension-preferences-navigation-item-lensapp-node-menu",
-    label: "lensapp-node-menu",
-    isActive: computed(() => false),
-    isVisible: computed(() => true),
-    navigate: () => noop,
-    orderNumber: 0,
-    parent: "extensions",
-  },
-  {
-    id: "extension-preferences-navigation-item-lensapp-pod-menu",
-    label: "lensapp-pod-menu",
-    isActive: computed(() => false),
-    isVisible: computed(() => true),
-    navigate: () => noop,
-    orderNumber: 0,
-    parent: "extensions",
-  },
-  {
-    id: "extension-preferences-navigation-item-metrics-plugin",
-    label: "metrics-plugin",
-    isActive: computed(() => false),
-    isVisible: computed(() => false),
-    navigate: () => noop,
-    orderNumber: 0,
-    parent: "extensions",
-  },
-];
-
diff --git a/src/renderer/components/+preferences/preferences-navigation/application-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/application-preferences-navigation-item.injectable.ts
deleted file mode 100644
index a3e35d35a9..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/application-preferences-navigation-item.injectable.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable";
-import appPreferencesRouteInjectable from "../../../../common/front-end-routing/routes/preferences/app/app-preferences-route.injectable";
-import routeIsActiveInjectable from "../../../routes/route-is-active.injectable";
-import { computed } from "mobx";
-import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab.injectable";
-
-const applicationPreferencesNavigationItemInjectable = getInjectable({
-  id: "application-preferences-navigation-item",
-
-  instantiate: (di) => {
-    const route = di.inject(appPreferencesRouteInjectable);
-    const navigateToPreferenceTab = di.inject(navigateToPreferenceTabInjectable);
-
-    const routeIsActive = di.inject(
-      routeIsActiveInjectable,
-      route,
-    );
-
-    return {
-      id: "application",
-      label: "App",
-      parent: "general",
-      navigate: navigateToPreferenceTab(route),
-      isActive: routeIsActive,
-      isVisible: computed(() => true),
-      orderNumber: 10,
-    };
-  },
-
-  injectionToken: preferenceNavigationItemInjectionToken,
-});
-
-export default applicationPreferencesNavigationItemInjectable;
diff --git a/src/renderer/components/+preferences/preferences-navigation/editor-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/editor-preferences-navigation-item.injectable.ts
deleted file mode 100644
index 686a688aa6..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/editor-preferences-navigation-item.injectable.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable";
-import routeIsActiveInjectable from "../../../routes/route-is-active.injectable";
-import { computed } from "mobx";
-import editorPreferencesRouteInjectable from "../../../../common/front-end-routing/routes/preferences/editor/editor-preferences-route.injectable";
-import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab.injectable";
-
-const editorPreferencesNavigationItemInjectable = getInjectable({
-  id: "editor-preferences-navigation-item",
-
-  instantiate: (di) => {
-    const route = di.inject(editorPreferencesRouteInjectable);
-    const navigateToPreferenceTab = di.inject(navigateToPreferenceTabInjectable);
-
-    const routeIsActive = di.inject(
-      routeIsActiveInjectable,
-      route,
-    );
-
-    return {
-      id: "editor",
-      label: "Editor",
-      parent: "general",
-      navigate: navigateToPreferenceTab(route),
-      isActive: routeIsActive,
-      isVisible: computed(() => true),
-      orderNumber: 40,
-    };
-  },
-
-  injectionToken: preferenceNavigationItemInjectionToken,
-});
-
-export default editorPreferencesNavigationItemInjectable;
diff --git a/src/renderer/components/+preferences/preferences-navigation/extension-tab-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/extension-tab-preferences-navigation-item.injectable.ts
deleted file mode 100644
index 3fb2062ecf..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/extension-tab-preferences-navigation-item.injectable.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { computed } from "mobx";
-import { map } from "lodash/fp";
-
-import routeIsActiveInjectable from "../../../routes/route-is-active.injectable";
-import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable";
-
-import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension";
-import { extensionRegistratorInjectionToken } from "../../../../extensions/extension-loader/extension-registrator-injection-token";
-import { pipeline } from "@ogre-tools/fp";
-import extensionPreferencesRouteInjectable from "../../../../common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable";
-import navigateToExtensionPreferencesInjectable from "../../../../common/front-end-routing/routes/preferences/extension/navigate-to-extension-preferences.injectable";
-import type { LensExtension } from "../../../../extensions/lens-extension";
-import routePathParametersInjectable from "../../../routes/route-path-parameters.injectable";
-
-const extensionSpecificTabNavigationItemRegistratorInjectable = getInjectable({
-  id: "extension-specific-tab-preferences-navigation-items",
-
-  instantiate: (di) => {
-    return (ext: LensExtension) => {
-      const extension = ext as LensRendererExtension;
-      const navigateToExtensionPreferences = di.inject(
-        navigateToExtensionPreferencesInjectable,
-      );
-      const route = di.inject(extensionPreferencesRouteInjectable);
-      const routeIsActive = di.inject(routeIsActiveInjectable, route);
-      const pathParameters = di.inject(routePathParametersInjectable, route);
-
-      return pipeline(
-        extension.appPreferenceTabs,
-
-        map((tab) => {
-          const id = `extension-${extension.sanitizedExtensionId}-nav-item-${tab.id}`;
-          const isActive = computed(() => routeIsActive.get() && pathParameters.get().tabId === tab.id);
-
-          return getInjectable({
-            id,
-            injectionToken: preferenceNavigationItemInjectionToken,
-            instantiate: () => ({
-              id,
-              label: tab.title,
-              parent: "general",
-              orderNumber: tab.orderNumber || 100,
-              navigate: () => navigateToExtensionPreferences(extension.sanitizedExtensionId, tab.id),
-
-              isVisible: computed(() => {
-                if (!tab.visible) {
-                  return true;
-                }
-
-                return tab.visible.get();
-              }),
-
-              isActive,
-            }),
-          });
-        }),
-      );
-    };
-  },
-  injectionToken: extensionRegistratorInjectionToken,
-});
-
-export default extensionSpecificTabNavigationItemRegistratorInjectable;
diff --git a/src/renderer/components/+preferences/preferences-navigation/extensions-nav-group.tsx b/src/renderer/components/+preferences/preferences-navigation/extensions-nav-group.tsx
deleted file mode 100644
index fd0c4158f6..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/extensions-nav-group.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import React from "react";
-import { withInjectables } from "@ogre-tools/injectable-react";
-import type { IComputedValue } from "mobx";
-import type { PreferenceNavigationItem } from "./preference-navigation-items.injectable";
-import { Icon } from "../../icon";
-import { PreferencesNavigationTab } from "./preference-navigation-tab";
-import preferenceNavigationItemsForGroupInjectable from "./preference-navigation-items-for-group.injectable";
-import { observer } from "mobx-react";
-
-interface Dependencies {
-  navigationItems: IComputedValue<PreferenceNavigationItem[]>;
-}
-
-const NonInjectedExtensionsNavGroup = observer((props: Dependencies) => {
-  if (!props.navigationItems.get().length) {
-    return null;
-  }
-
-  return (
-    <div data-testid="extension-settings">
-      <hr/>
-      <div className="header flex items-center">
-        <Icon
-          material="extension"
-          smallest
-          className="mr-3"
-        />
-        {" "}
-        Extensions
-      </div>
-      <div>
-        {props.navigationItems.get().map(item => (
-          <PreferencesNavigationTab
-            key={item.id}
-            item={item}
-            data-testid={`tab-link-for-${item.id}`}
-          />
-        ))}
-      </div>
-    </div>
-  );
-});
-
-export const ExtensionsNavGroup = withInjectables<Dependencies>(
-  NonInjectedExtensionsNavGroup,
-
-  {
-    getProps: (di) => ({
-      navigationItems: di.inject(preferenceNavigationItemsForGroupInjectable, "extensions"),
-    }),
-  },
-);
diff --git a/src/renderer/components/+preferences/preferences-navigation/extensions-preferences-navigation-item-registrator.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/extensions-preferences-navigation-item-registrator.injectable.ts
deleted file mode 100644
index 64b152e573..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/extensions-preferences-navigation-item-registrator.injectable.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { computed } from "mobx";
-import extensionPreferencesRouteInjectable from "../../../../common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable";
-import navigateToExtensionPreferencesInjectable from "../../../../common/front-end-routing/routes/preferences/extension/navigate-to-extension-preferences.injectable";
-import { extensionRegistratorInjectionToken } from "../../../../extensions/extension-loader/extension-registrator-injection-token";
-import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension";
-import routeIsActiveInjectable from "../../../routes/route-is-active.injectable";
-import routePathParametersInjectable from "../../../routes/route-path-parameters.injectable";
-import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable";
-
-const extensionPreferencesNavigationItemRegistratorInjectable = getInjectable({
-  id: "extension-preferences-navigation-item",
-
-  instantiate: (di) => {
-    return (ext) => {
-      const extension = ext as LensRendererExtension;
-      const navigateToExtensionPreferences = di.inject(
-        navigateToExtensionPreferencesInjectable,
-      );
-
-      const extensionHasPreferences = extension.appPreferences.length > 0;
-      const extensionHasGeneralPreferences = extension.appPreferences.some(preferences =>
-        !preferences.showInPreferencesTab,
-      );
-      const isVisible = computed(() => extensionHasPreferences && extensionHasGeneralPreferences);
-      const extensionRoute = di.inject(extensionPreferencesRouteInjectable);
-      const pathParameters = di.inject(routePathParametersInjectable, extensionRoute);
-      const routeIsActive = di.inject(routeIsActiveInjectable, extensionRoute);
-      const isActive = computed(() => routeIsActive.get() && pathParameters.get().extensionId === extension.sanitizedExtensionId);
-      const id = `extension-preferences-navigation-item-${extension.sanitizedExtensionId}`;
-
-      const injectable = getInjectable({
-        id,
-        injectionToken: preferenceNavigationItemInjectionToken,
-        instantiate: () => ({
-          id: `extension-${extension.sanitizedExtensionId}`,
-          label: `${extension.name}`,
-          navigate: () => navigateToExtensionPreferences(extension.sanitizedExtensionId),
-          isActive,
-          isVisible,
-          orderNumber: 20,
-          parent: "extensions",
-        }),
-      });
-
-      return [injectable];
-    };
-  },
-
-  injectionToken: extensionRegistratorInjectionToken,
-});
-
-export default extensionPreferencesNavigationItemRegistratorInjectable;
diff --git a/src/renderer/components/+preferences/preferences-navigation/general-nav-group.tsx b/src/renderer/components/+preferences/preferences-navigation/general-nav-group.tsx
deleted file mode 100644
index 0dc3b4693e..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/general-nav-group.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import React from "react";
-import { withInjectables } from "@ogre-tools/injectable-react";
-import type { IComputedValue } from "mobx";
-import type { PreferenceNavigationItem } from "./preference-navigation-items.injectable";
-import { PreferencesNavigationTab } from "./preference-navigation-tab";
-import preferenceNavigationItemsForGroupInjectable from "./preference-navigation-items-for-group.injectable";
-import { observer } from "mobx-react";
-
-interface Dependencies {
-  navigationItems: IComputedValue<PreferenceNavigationItem[]>;
-}
-
-const NonInjectedGeneralNavGroup = observer((props: Dependencies) => {
-  if (!props.navigationItems.get().length) {
-    return null;
-  }
-
-  return (
-    <React.Fragment>
-      <div className="header">Preferences</div>
-
-      {props.navigationItems.get().map(item => (
-        <PreferencesNavigationTab
-          key={item.id}
-          item={item}
-          data-testid={`tab-link-for-${item.id}`}
-        />
-      ))}
-    </React.Fragment>
-  );
-});
-
-export const GeneralNavGroup = withInjectables<Dependencies>(
-  NonInjectedGeneralNavGroup,
-
-  {
-    getProps: (di) => ({
-      navigationItems: di.inject(preferenceNavigationItemsForGroupInjectable, "general"),
-    }),
-  },
-);
diff --git a/src/renderer/components/+preferences/preferences-navigation/kubernetes-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/kubernetes-preferences-navigation-item.injectable.ts
deleted file mode 100644
index 6147021087..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/kubernetes-preferences-navigation-item.injectable.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable";
-import routeIsActiveInjectable from "../../../routes/route-is-active.injectable";
-import { computed } from "mobx";
-import kubernetesPreferencesRouteInjectable from "../../../../common/front-end-routing/routes/preferences/kubernetes/kubernetes-preferences-route.injectable";
-import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab.injectable";
-
-const kubernetesPreferencesNavigationItemInjectable = getInjectable({
-  id: "kubernetes-preferences-navigation-item",
-
-  instantiate: (di) => {
-    const navigateToPreferenceTab = di.inject(navigateToPreferenceTabInjectable);
-
-    const route = di.inject(
-      kubernetesPreferencesRouteInjectable,
-    );
-
-    const routeIsActive = di.inject(
-      routeIsActiveInjectable,
-      route,
-    );
-
-    return {
-      id: "kubernetes",
-      label: "Kubernetes",
-      parent: "general",
-      navigate: navigateToPreferenceTab(route),
-      isActive: routeIsActive,
-      isVisible: computed(() => true),
-      orderNumber: 30,
-    };
-  },
-
-  injectionToken: preferenceNavigationItemInjectionToken,
-});
-
-export default kubernetesPreferencesNavigationItemInjectable;
diff --git a/src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab.injectable.ts
deleted file mode 100644
index 70b5da347c..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { Route } from "../../../../common/front-end-routing/front-end-route-injection-token";
-import { navigateToRouteInjectionToken } from "../../../../common/front-end-routing/navigate-to-route-injection-token";
-
-const navigateToPreferenceTabInjectable = getInjectable({
-  id: "navigate-to-preference-tab",
-
-  instantiate: (di) => {
-    const navigateToRoute = di.inject(navigateToRouteInjectionToken);
-
-    return (route: Route) => () => {
-      navigateToRoute(route, { withoutAffectingBackButton: true });
-    };
-  },
-});
-
-export default navigateToPreferenceTabInjectable;
diff --git a/src/renderer/components/+preferences/preferences-navigation/preference-navigation-items-for-group.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/preference-navigation-items-for-group.injectable.ts
deleted file mode 100644
index 9c63626f2b..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/preference-navigation-items-for-group.injectable.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import {
-  getInjectable,
-  lifecycleEnum,
-} from "@ogre-tools/injectable";
-import { computed } from "mobx";
-import type { PreferenceNavigationItem } from "./preference-navigation-items.injectable";
-import preferenceNavigationItemsInjectable from "./preference-navigation-items.injectable";
-
-const preferenceNavigationItemsForGroupInjectable = getInjectable({
-  id: "preference-navigation-items-for-group",
-
-  instantiate: (di, group: string) => {
-    const preferenceNavigationItems = di.inject(preferenceNavigationItemsInjectable);
-
-    return computed((): PreferenceNavigationItem[] =>
-      preferenceNavigationItems.get().filter((item) => item.parent == group),
-    );
-  },
-
-  lifecycle: lifecycleEnum.keyedSingleton({
-    getInstanceKey: (di, group: string) => group,
-  }),
-});
-
-export default preferenceNavigationItemsForGroupInjectable;
-
diff --git a/src/renderer/components/+preferences/preferences-navigation/preference-navigation-items.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/preference-navigation-items.injectable.ts
deleted file mode 100644
index 8340ff003e..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/preference-navigation-items.injectable.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { pipeline } from "@ogre-tools/fp";
-import { getInjectable, getInjectionToken } from "@ogre-tools/injectable";
-import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
-import { filter, orderBy } from "lodash/fp";
-import type { IComputedValue } from "mobx";
-import { computed } from "mobx";
-
-export const preferenceNavigationItemInjectionToken =
-  getInjectionToken<PreferenceNavigationItem>({
-    id: "preference-navigation-item-injection-token",
-  });
-
-export interface PreferenceNavigationItem {
-  id: string;
-  label: string;
-  isActive: IComputedValue<boolean>;
-  isVisible: IComputedValue<boolean>;
-  navigate: () => void;
-  orderNumber: number;
-  parent: string;
-}
-
-const preferenceNavigationItemsInjectable = getInjectable({
-  id: "preference-navigation-items",
-
-  instantiate: (di) => {
-    const computedInjectMany = di.inject(computedInjectManyInjectable);
-    const navigationItems = computedInjectMany(preferenceNavigationItemInjectionToken);
-
-    return computed((): PreferenceNavigationItem[] =>
-      pipeline(
-        navigationItems.get(),
-        filter((item) => !!item.isVisible.get()),
-        (items) => orderBy([(item) => item.orderNumber], ["asc"], items),
-      ),
-    );
-  },
-});
-
-export default preferenceNavigationItemsInjectable;
diff --git a/src/renderer/components/+preferences/preferences-navigation/preference-navigation-tab.tsx b/src/renderer/components/+preferences/preferences-navigation/preference-navigation-tab.tsx
deleted file mode 100644
index a236c74ea9..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/preference-navigation-tab.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { observer } from "mobx-react";
-import React from "react";
-import { Tab } from "../../tabs";
-import type { PreferenceNavigationItem } from "./preference-navigation-items.injectable";
-
-interface PreferenceNavigationTabProps extends React.DOMAttributes<HTMLElement> {
-  item: PreferenceNavigationItem;
-}
-
-export const PreferencesNavigationTab = observer(({ item }: PreferenceNavigationTabProps) => (
-  <Tab
-    value={item}
-    label={item.label}
-    data-testid={`tab-link-for-${item.id}`}
-    active={item.isActive.get()}
-  />
-));
diff --git a/src/renderer/components/+preferences/preferences-navigation/preferences-navigation.tsx b/src/renderer/components/+preferences/preferences-navigation/preferences-navigation.tsx
deleted file mode 100644
index 55830433cd..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/preferences-navigation.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import React from "react";
-import { Tabs } from "../../tabs";
-import { ExtensionsNavGroup } from "./extensions-nav-group";
-import { GeneralNavGroup } from "./general-nav-group";
-import type {
-  PreferenceNavigationItem,
-} from "./preference-navigation-items.injectable";
-
-export const PreferencesNavigation = () => {
-  return (
-    <Tabs
-      className="flex column"
-      scrollable={false}
-      onChange={(item: PreferenceNavigationItem) => item.navigate()}
-    >
-      <GeneralNavGroup/>
-      <ExtensionsNavGroup/>
-    </Tabs>
-  );
-};
diff --git a/src/renderer/components/+preferences/preferences-navigation/proxy-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/proxy-preferences-navigation-item.injectable.ts
deleted file mode 100644
index fd0b835d12..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/proxy-preferences-navigation-item.injectable.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable";
-import routeIsActiveInjectable from "../../../routes/route-is-active.injectable";
-import { computed } from "mobx";
-import proxyPreferencesRouteInjectable from "../../../../common/front-end-routing/routes/preferences/proxy/proxy-preferences-route.injectable";
-import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab.injectable";
-
-const proxyPreferencesNavigationItemInjectable = getInjectable({
-  id: "proxy-preferences-navigation-item",
-
-  instantiate: (di) => {
-    const route = di.inject(proxyPreferencesRouteInjectable);
-
-    const navigateToPreferenceTab = di.inject(
-      navigateToPreferenceTabInjectable,
-    );
-
-    const routeIsActive = di.inject(routeIsActiveInjectable, route);
-
-    return {
-      id: "proxy",
-      label: "Proxy",
-      parent: "general",
-      navigate: navigateToPreferenceTab(route),
-      isActive: routeIsActive,
-      isVisible: computed(() => true),
-      orderNumber: 20,
-    };
-  },
-
-  injectionToken: preferenceNavigationItemInjectionToken,
-});
-
-export default proxyPreferencesNavigationItemInjectable;
diff --git a/src/renderer/components/+preferences/preferences-navigation/telemetry-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/telemetry-preferences-navigation-item.injectable.ts
deleted file mode 100644
index 1f95c74a0d..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/telemetry-preferences-navigation-item.injectable.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable";
-import routeIsActiveInjectable from "../../../routes/route-is-active.injectable";
-import { computed } from "mobx";
-import telemetryPreferenceItemsInjectable from "../telemetry-preference-items.injectable";
-import telemetryPreferencesRouteInjectable from "../../../../common/front-end-routing/routes/preferences/telemetry/telemetry-preferences-route.injectable";
-import sentryDnsUrlInjectable from "../sentry-dns-url.injectable";
-import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab.injectable";
-
-const terminalPreferencesNavigationItemInjectable = getInjectable({
-  id: "telemetry-preferences-navigation-item",
-
-  instantiate: (di) => {
-    const sentryDnsUrl = di.inject(sentryDnsUrlInjectable);
-
-    const telemetryPreferenceItems = di.inject(
-      telemetryPreferenceItemsInjectable,
-    );
-
-    const navigateToPreferenceTab = di.inject(
-      navigateToPreferenceTabInjectable,
-    );
-
-    const route = di.inject(telemetryPreferencesRouteInjectable);
-
-    const routeIsActive = di.inject(routeIsActiveInjectable, route);
-
-    return {
-      id: "telemetry",
-      label: "Telemetry",
-      parent: "general",
-      navigate: navigateToPreferenceTab(route),
-      isActive: routeIsActive,
-
-      isVisible: computed(
-        () => !!sentryDnsUrl || telemetryPreferenceItems.get().length > 0,
-      ),
-
-      orderNumber: 60,
-    };
-  },
-
-  injectionToken: preferenceNavigationItemInjectionToken,
-});
-
-export default terminalPreferencesNavigationItemInjectable;
diff --git a/src/renderer/components/+preferences/preferences-navigation/terminal-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/terminal-preferences-navigation-item.injectable.ts
deleted file mode 100644
index f5ad555c3b..0000000000
--- a/src/renderer/components/+preferences/preferences-navigation/terminal-preferences-navigation-item.injectable.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable";
-import routeIsActiveInjectable from "../../../routes/route-is-active.injectable";
-import { computed } from "mobx";
-import terminalPreferencesRouteInjectable from "../../../../common/front-end-routing/routes/preferences/terminal/terminal-preferences-route.injectable";
-import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab.injectable";
-
-const terminalPreferencesNavigationItemInjectable = getInjectable({
-  id: "terminal-preferences-navigation-item",
-
-  instantiate: (di) => {
-    const navigateToPreferenceTab = di.inject(
-      navigateToPreferenceTabInjectable,
-    );
-
-    const route = di.inject(terminalPreferencesRouteInjectable);
-
-    const routeIsActive = di.inject(routeIsActiveInjectable, route);
-
-    return {
-      id: "terminal",
-      label: "Terminal",
-      parent: "general",
-      navigate: navigateToPreferenceTab(route),
-      isActive: routeIsActive,
-      isVisible: computed(() => true),
-      orderNumber: 50,
-    };
-  },
-
-  injectionToken: preferenceNavigationItemInjectionToken,
-});
-
-export default terminalPreferencesNavigationItemInjectable;
diff --git a/src/renderer/components/+preferences/preferences.tsx b/src/renderer/components/+preferences/preferences.tsx
deleted file mode 100644
index ab40a5ba13..0000000000
--- a/src/renderer/components/+preferences/preferences.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import "./preferences.scss";
-import React from "react";
-
-import { SettingLayout } from "../layout/setting-layout";
-import { PreferencesNavigation } from "./preferences-navigation/preferences-navigation";
-import { withInjectables } from "@ogre-tools/injectable-react";
-import closePreferencesInjectable from "./close-preferences.injectable";
-
-interface PreferencesProps extends React.DOMAttributes<any> {
-  children: React.ReactNode;
-}
-
-interface Dependencies {
-  closePreferences: () => void;
-}
-
-const NonInjectedPreferences = ({
-  children,
-  closePreferences,
-  ...props
-}: PreferencesProps & Dependencies) => (
-  <SettingLayout
-    navigation={<PreferencesNavigation />}
-    className="Preferences"
-    contentGaps={false}
-    closeButtonProps={{ "data-testid": "close-preferences" }}
-    back={closePreferences}
-    {...props}
-  >
-    {children}
-  </SettingLayout>
-);
-
-export const Preferences = withInjectables<Dependencies, PreferencesProps>(
-  NonInjectedPreferences,
-
-  {
-    getProps: (di, props) => ({
-      closePreferences: di.inject(closePreferencesInjectable),
-      ...props,
-    }),
-  },
-);
-
diff --git a/src/renderer/components/+preferences/proxy-preferences-route-component.injectable.ts b/src/renderer/components/+preferences/proxy-preferences-route-component.injectable.ts
deleted file mode 100644
index 62540dfc42..0000000000
--- a/src/renderer/components/+preferences/proxy-preferences-route-component.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { routeSpecificComponentInjectionToken } from "../../routes/route-specific-component-injection-token";
-import proxyPreferencesRouteInjectable from "../../../common/front-end-routing/routes/preferences/proxy/proxy-preferences-route.injectable";
-import { LensProxy } from "./proxy";
-
-const proxyPreferencesRouteComponentInjectable = getInjectable({
-  id: "proxy-preferences-route-component",
-
-  instantiate: (di) => ({
-    route: di.inject(proxyPreferencesRouteInjectable),
-    Component: LensProxy,
-  }),
-
-  injectionToken: routeSpecificComponentInjectionToken,
-});
-
-export default proxyPreferencesRouteComponentInjectable;
diff --git a/src/renderer/components/+preferences/proxy.tsx b/src/renderer/components/+preferences/proxy.tsx
deleted file mode 100644
index a87b2261a1..0000000000
--- a/src/renderer/components/+preferences/proxy.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { withInjectables } from "@ogre-tools/injectable-react";
-import { observer } from "mobx-react";
-import React from "react";
-import type { UserStore } from "../../../common/user-store";
-import { Input } from "../input";
-import { SubTitle } from "../layout/sub-title";
-import { Switch } from "../switch";
-import { Preferences } from "./preferences";
-import userStoreInjectable from "../../../common/user-store/user-store.injectable";
-
-interface Dependencies {
-  userStore: UserStore;
-}
-
-const NonInjectedLensProxy = observer(({ userStore }: Dependencies) => {
-  const [proxy, setProxy] = React.useState(userStore.httpsProxy || "");
-
-  return (
-    <Preferences data-testid="proxy-preferences-page">
-      <section id="proxy">
-        <section>
-          <h2 data-testid="proxy-header">Proxy</h2>
-          <SubTitle title="HTTP Proxy" />
-          <Input
-            theme="round-black"
-            placeholder="Type HTTP proxy url (example: http://proxy.acme.org:8080)"
-            value={proxy}
-            onChange={v => setProxy(v)}
-            onBlur={() => userStore.httpsProxy = proxy}
-          />
-          <small className="hint">
-            Proxy is used only for non-cluster communication.
-          </small>
-        </section>
-
-        <hr className="small" />
-
-        <section className="small">
-          <SubTitle title="Certificate Trust" />
-          <Switch
-            checked={userStore.allowUntrustedCAs}
-            onChange={() => userStore.allowUntrustedCAs = !userStore.allowUntrustedCAs}
-          >
-            Allow untrusted Certificate Authorities
-          </Switch>
-          <small className="hint">
-            This will make Lens to trust ANY certificate authority without any validations.
-            {" "}
-            Needed with some corporate proxies that do certificate re-writing.
-            {" "}
-            Does not affect cluster communications!
-          </small>
-        </section>
-      </section>
-    </Preferences>
-  );
-});
-
-export const LensProxy = withInjectables<Dependencies>(
-  NonInjectedLensProxy,
-
-  {
-    getProps: (di) => ({
-      userStore: di.inject(userStoreInjectable),
-    }),
-  },
-);
diff --git a/src/renderer/components/+preferences/telemetry-preference-items.injectable.ts b/src/renderer/components/+preferences/telemetry-preference-items.injectable.ts
deleted file mode 100644
index b0b920e7f5..0000000000
--- a/src/renderer/components/+preferences/telemetry-preference-items.injectable.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable, getInjectionToken } from "@ogre-tools/injectable";
-import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
-import type { AppPreferenceRegistration } from "./app-preferences/app-preference-registration";
-
-export const telemetryPreferenceItemInjectionToken = getInjectionToken<AppPreferenceRegistration>({
-  id: "telemetry-preference-item-injection-token",
-});
-
-const telemetryPreferenceItemsInjectable = getInjectable({
-  id: "telemetry-preference-items",
-
-  instantiate: (di) => {
-    const computedInjectMany = di.inject(computedInjectManyInjectable);
-
-    return computedInjectMany(telemetryPreferenceItemInjectionToken);
-  },
-});
-
-export default telemetryPreferenceItemsInjectable;
-
diff --git a/src/renderer/components/+preferences/telemetry-preferences-route-component.injectable.ts b/src/renderer/components/+preferences/telemetry-preferences-route-component.injectable.ts
deleted file mode 100644
index 6d78ecfccc..0000000000
--- a/src/renderer/components/+preferences/telemetry-preferences-route-component.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { routeSpecificComponentInjectionToken } from "../../routes/route-specific-component-injection-token";
-import telemetryPreferencesRouteInjectable from "../../../common/front-end-routing/routes/preferences/telemetry/telemetry-preferences-route.injectable";
-import { Telemetry } from "./telemetry";
-
-const telemetryPreferencesRouteComponentInjectable = getInjectable({
-  id: "telemetry-preferences-route-component",
-
-  instantiate: (di) => ({
-    route: di.inject(telemetryPreferencesRouteInjectable),
-    Component: Telemetry,
-  }),
-
-  injectionToken: routeSpecificComponentInjectionToken,
-});
-
-export default telemetryPreferencesRouteComponentInjectable;
diff --git a/src/renderer/components/+preferences/telemetry.tsx b/src/renderer/components/+preferences/telemetry.tsx
deleted file mode 100644
index 26809ee2f2..0000000000
--- a/src/renderer/components/+preferences/telemetry.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { observer } from "mobx-react";
-import React from "react";
-import type { UserStore } from "../../../common/user-store";
-import { Checkbox } from "../checkbox";
-import { SubTitle } from "../layout/sub-title";
-import { ExtensionSettings } from "./extension-settings";
-import type { IComputedValue } from "mobx";
-import { withInjectables } from "@ogre-tools/injectable-react";
-import { Preferences } from "./preferences";
-import telemetryPreferenceItemsInjectable from "./telemetry-preference-items.injectable";
-import sentryDnsUrlInjectable from "./sentry-dns-url.injectable";
-import userStoreInjectable from "../../../common/user-store/user-store.injectable";
-import type { AppPreferenceRegistration } from "./app-preferences/app-preference-registration";
-
-interface Dependencies {
-  telemetryPreferenceItems: IComputedValue<AppPreferenceRegistration[]>;
-  sentryDnsUrl: string;
-  userStore: UserStore;
-}
-
-const NonInjectedTelemetry: React.FC<Dependencies> = ({
-  telemetryPreferenceItems,
-  sentryDnsUrl,
-  userStore,
-}) => (
-  <Preferences data-testid="telemetry-preferences-page">
-    <section id="telemetry">
-      <h2 data-testid="telemetry-header">Telemetry</h2>
-      {telemetryPreferenceItems.get().map((item) => (
-        <ExtensionSettings
-          key={item.id}
-          setting={item}
-          size="small"
-          data-testid={`telemetry-preference-item-for-${item.id}`}
-        />
-      ))}
-      {sentryDnsUrl ? (
-        <React.Fragment key="sentry">
-          <section
-            id="sentry"
-            className="small"
-            data-testid="telemetry-preferences-for-automatic-error-reporting"
-          >
-            <SubTitle title="Automatic Error Reporting" />
-            <Checkbox
-              label="Allow automatic error reporting"
-              value={userStore.allowErrorReporting}
-              onChange={(value) => userStore.allowErrorReporting = value}
-            />
-            <div className="hint">
-              <span>
-                Automatic error reports provide vital information about issues
-                and application crashes. It is highly recommended to keep this
-                feature enabled to ensure fast turnaround for issues you might
-                encounter.
-              </span>
-            </div>
-          </section>
-          <hr className="small" />
-        </React.Fragment>
-      ) : // we don't need to shows the checkbox at all if Sentry dsn is not a valid url
-        null}
-    </section>
-  </Preferences>
-);
-
-export const Telemetry = withInjectables<Dependencies>(
-  observer(NonInjectedTelemetry),
-
-  {
-    getProps: (di) => ({
-      telemetryPreferenceItems: di.inject(telemetryPreferenceItemsInjectable),
-      sentryDnsUrl: di.inject(sentryDnsUrlInjectable),
-      userStore: di.inject(userStoreInjectable),
-    }),
-  },
-);
diff --git a/src/renderer/components/+preferences/terminal.tsx b/src/renderer/components/+preferences/terminal.tsx
deleted file mode 100644
index 57c3ad6394..0000000000
--- a/src/renderer/components/+preferences/terminal.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import React from "react";
-import { action } from "mobx";
-import { observer } from "mobx-react";
-import type { UserStore } from "../../../common/user-store";
-import { SubTitle } from "../layout/sub-title";
-import { Input } from "../input";
-import { Switch } from "../switch";
-import { Select, type SelectOption } from "../select";
-import type { ThemeStore } from "../../themes/store";
-import { Preferences } from "./preferences";
-import { withInjectables } from "@ogre-tools/injectable-react";
-import userStoreInjectable from "../../../common/user-store/user-store.injectable";
-import themeStoreInjectable from "../../themes/store.injectable";
-import defaultShellInjectable from "./default-shell.injectable";
-import logger from "../../../common/logger";
-
-interface Dependencies {
-  userStore: UserStore;
-  themeStore: ThemeStore;
-  defaultShell: string;
-}
-
-const NonInjectedTerminal = observer((
-  {
-    userStore,
-    themeStore,
-    defaultShell,
-  }: Dependencies) => {
-  const themeOptions = [
-    {
-      value: "", // TODO: replace with a sentinal value that isn't string (and serialize it differently)
-      label: "Match Lens Theme",
-    },
-    ...Array.from(themeStore.themes, ([themeId, { name }]) => ({
-      value: themeId,
-      label: name,
-    })),
-  ];
-
-  // fonts must be declared in `fonts.scss` and at `template.html` (if early-preloading required)
-  const supportedCustomFonts: SelectOption<string>[] = [
-    "RobotoMono", "Anonymous Pro", "IBM Plex Mono", "JetBrains Mono", "Red Hat Mono",
-    "Source Code Pro", "Space Mono", "Ubuntu Mono",
-  ].map(customFont => {
-    const { fontFamily, fontSize } = userStore.terminalConfig;
-
-    return {
-      label: <span style={{ fontFamily: customFont, fontSize }}>{customFont}</span>,
-      value: customFont,
-      isSelected: fontFamily === customFont,
-    };
-  });
-
-  const onFontFamilyChange = action(({ value: fontFamily }: SelectOption<string>) => {
-    logger.info(`setting terminal font to ${fontFamily}`);
-
-    userStore.terminalConfig.fontFamily = fontFamily; // save to external storage
-  });
-
-  return (
-    <Preferences data-testid="terminal-preferences-page">
-      <section>
-        <h2>Terminal</h2>
-
-        <section id="shell">
-          <SubTitle title="Terminal Shell Path" />
-          <Input
-            theme="round-black"
-            placeholder={defaultShell}
-            value={userStore.shell ?? ""}
-            onChange={(value) => userStore.shell = value}
-          />
-        </section>
-
-        <section id="terminalSelection">
-          <SubTitle title="Terminal copy & paste" />
-          <Switch
-            checked={userStore.terminalCopyOnSelect}
-            onChange={() => userStore.terminalCopyOnSelect = !userStore.terminalCopyOnSelect}
-          >
-            Copy on select and paste on right-click
-          </Switch>
-        </section>
-
-        <section id="terminalTheme">
-          <SubTitle title="Terminal theme" />
-          <Select
-            id="terminal-theme-input"
-            themeName="lens"
-            options={themeOptions}
-            value={userStore.terminalTheme}
-            onChange={option => userStore.terminalTheme = option?.value ?? ""}
-          />
-        </section>
-
-        <section>
-          <SubTitle title="Font size" />
-          <Input
-            theme="round-black"
-            type="number"
-            min={10}
-            max={50}
-            defaultValue={userStore.terminalConfig.fontSize.toString()}
-            onChange={(value) => userStore.terminalConfig.fontSize = Number(value)}
-          />
-        </section>
-        <section>
-          <SubTitle title="Font family" />
-          <Select
-            themeName="lens"
-            controlShouldRenderValue
-            value={userStore.terminalConfig.fontFamily}
-            options={supportedCustomFonts}
-            onChange={onFontFamilyChange as any}
-          />
-        </section>
-      </section>
-    </Preferences>
-  );
-});
-
-export const Terminal = withInjectables<Dependencies>(
-  NonInjectedTerminal,
-
-  {
-    getProps: (di) => ({
-      userStore: di.inject(userStoreInjectable),
-      themeStore: di.inject(themeStoreInjectable),
-      defaultShell: di.inject(defaultShellInjectable),
-    }),
-  },
-);
-
diff --git a/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx b/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx
index cd4bd5e0a6..250ab2e713 100644
--- a/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx
+++ b/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx
@@ -10,26 +10,40 @@ import { makeObservable, observable, reaction } from "mobx";
 import { disposeOnUnmount, observer } from "mobx-react";
 import { DrawerItem, DrawerTitle } from "../drawer";
 import { Badge } from "../badge";
-import { podStore } from "../+workloads-pods/legacy-store";
 import { Link } from "react-router-dom";
 import { ResourceMetrics } from "../resource-metrics";
 import { VolumeClaimDiskChart } from "./volume-claim-disk-chart";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
-import { getMetricsForPvc, type PersistentVolumeClaimMetricData, PersistentVolumeClaim } from "../../../common/k8s-api/endpoints";
-import { getActiveClusterEntity } from "../../api/catalog/entity/legacy-globals";
+import { PersistentVolumeClaim, storageClassApi } from "../../../common/k8s-api/endpoints";
 import { ClusterMetricsResourceType } from "../../../common/cluster-types";
 import { KubeObjectMeta } from "../kube-object-meta";
-import { getDetailsUrl } from "../kube-detail-params";
 import logger from "../../../common/logger";
+import type { PersistentVolumeClaimMetricData, RequestPersistentVolumeClaimMetrics } from "../../../common/k8s-api/endpoints/metrics.api/request-persistent-volume-claim-metrics.injectable";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import requestPersistentVolumeClaimMetricsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-persistent-volume-claim-metrics.injectable";
+import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable";
+import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable";
+import type { PodStore } from "../+workloads-pods/store";
+import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable";
+import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
+import podStoreInjectable from "../+workloads-pods/store.injectable";
+import { stopPropagation } from "../../../renderer/utils";
 
 export interface PersistentVolumeClaimDetailsProps extends KubeObjectDetailsProps<PersistentVolumeClaim> {
 }
 
+interface Dependencies {
+  requestPersistentVolumeClaimMetrics: RequestPersistentVolumeClaimMetrics;
+  getActiveClusterEntity: GetActiveClusterEntity;
+  getDetailsUrl: GetDetailsUrl;
+  podStore: PodStore;
+}
+
 @observer
-export class PersistentVolumeClaimDetails extends React.Component<PersistentVolumeClaimDetailsProps> {
+class NonInjectedPersistentVolumeClaimDetails extends React.Component<PersistentVolumeClaimDetailsProps & Dependencies> {
   @observable metrics: PersistentVolumeClaimMetricData | null = null;
 
-  constructor(props: PersistentVolumeClaimDetailsProps) {
+  constructor(props: PersistentVolumeClaimDetailsProps & Dependencies) {
     super(props);
     makeObservable(this);
   }
@@ -43,13 +57,13 @@ export class PersistentVolumeClaimDetails extends React.Component<PersistentVolu
   }
 
   loadMetrics = async () => {
-    const { object: volumeClaim } = this.props;
+    const { object: volumeClaim, requestPersistentVolumeClaimMetrics } = this.props;
 
-    this.metrics = await getMetricsForPvc(volumeClaim);
+    this.metrics = await requestPersistentVolumeClaimMetrics(volumeClaim);
   };
 
   render() {
-    const { object: volumeClaim } = this.props;
+    const { object: volumeClaim, getActiveClusterEntity, podStore, getDetailsUrl } = this.props;
 
     if (!volumeClaim) {
       return null;
@@ -65,6 +79,10 @@ export class PersistentVolumeClaimDetails extends React.Component<PersistentVolu
     const pods = volumeClaim.getPods(podStore.items);
     const isMetricHidden = getActiveClusterEntity()?.isMetricHidden(ClusterMetricsResourceType.VolumeClaim);
 
+    const storageClassDetailsUrl = getDetailsUrl(storageClassApi.getUrl({
+      name: storageClassName,
+    }));
+
     return (
       <div className="PersistentVolumeClaimDetails">
         {!isMetricHidden && (
@@ -76,15 +94,21 @@ export class PersistentVolumeClaimDetails extends React.Component<PersistentVolu
             object={volumeClaim}
             metrics={this.metrics}
           >
-            <VolumeClaimDiskChart/>
+            <VolumeClaimDiskChart />
           </ResourceMetrics>
         )}
-        <KubeObjectMeta object={volumeClaim}/>
+        <KubeObjectMeta object={volumeClaim} />
         <DrawerItem name="Access Modes">
           {accessModes?.join(", ")}
         </DrawerItem>
         <DrawerItem name="Storage Class Name">
-          {storageClassName}
+          <Link
+            key="link"
+            to={storageClassDetailsUrl}
+            onClick={stopPropagation}
+          >
+            {storageClassName}
+          </Link>
         </DrawerItem>
         <DrawerItem name="Storage">
           {volumeClaim.getStorage()}
@@ -103,7 +127,7 @@ export class PersistentVolumeClaimDetails extends React.Component<PersistentVolu
         <DrawerTitle>Selector</DrawerTitle>
 
         <DrawerItem name="Match Labels" labelsOnly>
-          {volumeClaim.getMatchLabels().map(label => <Badge key={label} label={label}/>)}
+          {volumeClaim.getMatchLabels().map(label => <Badge key={label} label={label} />)}
         </DrawerItem>
 
         <DrawerItem name="Match Expressions">
@@ -119,3 +143,13 @@ export class PersistentVolumeClaimDetails extends React.Component<PersistentVolu
     );
   }
 }
+
+export const PersistentVolumeClaimDetails = withInjectables<Dependencies, PersistentVolumeClaimDetailsProps>(NonInjectedPersistentVolumeClaimDetails, {
+  getProps: (di, props) => ({
+    ...props,
+    requestPersistentVolumeClaimMetrics: di.inject(requestPersistentVolumeClaimMetricsInjectable),
+    getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable),
+    getDetailsUrl: di.inject(getDetailsUrlInjectable),
+    podStore: di.inject(podStoreInjectable),
+  }),
+});
diff --git a/src/renderer/components/+storage-volumes/volume-details.tsx b/src/renderer/components/+storage-volumes/volume-details.tsx
index 4e2a436b91..32ab0c5307 100644
--- a/src/renderer/components/+storage-volumes/volume-details.tsx
+++ b/src/renderer/components/+storage-volumes/volume-details.tsx
@@ -11,11 +11,12 @@ import { Link } from "react-router-dom";
 import { observer } from "mobx-react";
 import { DrawerItem, DrawerTitle } from "../drawer";
 import { Badge } from "../badge";
-import { PersistentVolume, persistentVolumeClaimApi } from "../../../common/k8s-api/endpoints";
+import { PersistentVolume, persistentVolumeClaimApi, storageClassApi } from "../../../common/k8s-api/endpoints";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { KubeObjectMeta } from "../kube-object-meta";
 import { getDetailsUrl } from "../kube-detail-params";
 import logger from "../../../common/logger";
+import { stopPropagation } from "../../../renderer/utils";
 
 export interface PersistentVolumeDetailsProps extends KubeObjectDetailsProps<PersistentVolume> {
 }
@@ -37,9 +38,13 @@ export class PersistentVolumeDetails extends React.Component<PersistentVolumeDet
 
     const { accessModes, capacity, persistentVolumeReclaimPolicy, storageClassName, claimRef, flexVolume, mountOptions, nfs } = volume.spec;
 
+    const storageClassDetailsUrl = getDetailsUrl(storageClassApi.getUrl({
+      name: storageClassName,
+    }));
+
     return (
       <div className="PersistentVolumeDetails">
-        <KubeObjectMeta object={volume}/>
+        <KubeObjectMeta object={volume} />
         <DrawerItem name="Capacity">
           {capacity?.storage}
         </DrawerItem>
@@ -57,10 +62,16 @@ export class PersistentVolumeDetails extends React.Component<PersistentVolumeDet
           {persistentVolumeReclaimPolicy}
         </DrawerItem>
         <DrawerItem name="Storage Class Name">
-          {storageClassName}
+          <Link
+            key="link"
+            to={storageClassDetailsUrl}
+            onClick={stopPropagation}
+          >
+            {storageClassName}
+          </Link>
         </DrawerItem>
         <DrawerItem name="Status" labelsOnly>
-          <Badge label={volume.getStatus()}/>
+          <Badge label={volume.getStatus()} />
         </DrawerItem>
 
         {nfs && (
diff --git a/src/renderer/components/+user-management/+service-accounts/service-account-menu.tsx b/src/renderer/components/+user-management/+service-accounts/service-account-menu.tsx
index 23540ce3ea..63b1d89a20 100644
--- a/src/renderer/components/+user-management/+service-accounts/service-account-menu.tsx
+++ b/src/renderer/components/+user-management/+service-accounts/service-account-menu.tsx
@@ -7,20 +7,33 @@ import React from "react";
 import type { KubeObjectMenuProps } from "../../kube-object-menu";
 import type { ServiceAccount } from "../../../../common/k8s-api/endpoints";
 import { MenuItem } from "../../menu";
-import { openServiceAccountKubeConfig } from "../../kubeconfig-dialog";
 import { Icon } from "../../icon";
+import type { OpenServiceAccountKubeConfigDialog } from "../../kubeconfig-dialog/open-service-account-kube-config-dialog.injectable";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import openServiceAccountKubeConfigDialogInjectable from "../../kubeconfig-dialog/open-service-account-kube-config-dialog.injectable";
 
-export function ServiceAccountMenu(props: KubeObjectMenuProps<ServiceAccount>) {
-  const { object, toolbar } = props;
+interface Dependencies {
+  openServiceAccountKubeConfigDialog: OpenServiceAccountKubeConfigDialog;
+}
+
+function NonInjectedServiceAccountMenu(props: KubeObjectMenuProps<ServiceAccount> & Dependencies) {
+  const { object, toolbar, openServiceAccountKubeConfigDialog } = props;
 
   return (
-    <MenuItem onClick={() => openServiceAccountKubeConfig(object)}>
+    <MenuItem onClick={() => openServiceAccountKubeConfigDialog(object)}>
       <Icon
         material="insert_drive_file"
         tooltip="Kubeconfig File"
-        interactive={toolbar} 
+        interactive={toolbar}
       />
       <span className="title">Kubeconfig</span>
     </MenuItem>
   );
 }
+
+export const ServiceAccountMenu = withInjectables<Dependencies, KubeObjectMenuProps<ServiceAccount>>(NonInjectedServiceAccountMenu, {
+  getProps: (di, props) => ({
+    ...props,
+    openServiceAccountKubeConfigDialog: di.inject(openServiceAccountKubeConfigDialogInjectable),
+  }),
+});
diff --git a/src/renderer/components/+welcome/welcome-route-component.injectable.ts b/src/renderer/components/+welcome/default-welcome-route-component.injectable.ts
similarity index 58%
rename from src/renderer/components/+welcome/welcome-route-component.injectable.ts
rename to src/renderer/components/+welcome/default-welcome-route-component.injectable.ts
index 65fa0dfb00..5472c49787 100644
--- a/src/renderer/components/+welcome/welcome-route-component.injectable.ts
+++ b/src/renderer/components/+welcome/default-welcome-route-component.injectable.ts
@@ -4,18 +4,18 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { Welcome } from "./welcome";
-import welcomeRouteInjectable from "../../../common/front-end-routing/routes/welcome/welcome-route.injectable";
+import defaultWelcomeRouteInjectable from "../../../common/front-end-routing/routes/welcome/default-welcome-route.injectable";
 import { routeSpecificComponentInjectionToken } from "../../routes/route-specific-component-injection-token";
 
-const welcomeRouteComponentInjectable = getInjectable({
-  id: "welcome-route-component",
+const defaultWelcomeRouteComponentInjectable = getInjectable({
+  id: "default-welcome-route-component",
 
   instantiate: (di) => ({
-    route: di.inject(welcomeRouteInjectable),
+    route: di.inject(defaultWelcomeRouteInjectable),
     Component: Welcome,
   }),
 
   injectionToken: routeSpecificComponentInjectionToken,
 });
 
-export default welcomeRouteComponentInjectable;
+export default defaultWelcomeRouteComponentInjectable;
diff --git a/src/renderer/components/+welcome/welcome.tsx b/src/renderer/components/+welcome/welcome.tsx
index 4be617ae73..cf413748bc 100644
--- a/src/renderer/components/+welcome/welcome.tsx
+++ b/src/renderer/components/+welcome/welcome.tsx
@@ -10,12 +10,13 @@ import type { IComputedValue } from "mobx";
 import type { CarouselProps } from "react-material-ui-carousel";
 import LegacyCarousel from "react-material-ui-carousel";
 import { Icon } from "../icon";
-import { productName, slackUrl } from "../../../common/vars";
+import { slackUrl } from "../../../common/vars";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import welcomeMenuItemsInjectable from "./welcome-menu-items/welcome-menu-items.injectable";
 import type { WelcomeMenuRegistration } from "./welcome-menu-items/welcome-menu-registration";
 import welcomeBannerItemsInjectable from "./welcome-banner-items/welcome-banner-items.injectable";
 import type { WelcomeBannerRegistration } from "./welcome-banner-items/welcome-banner-registration";
+import productNameInjectable from "../../../common/vars/product-name.injectable";
 
 export const defaultWidth = 320;
 
@@ -25,9 +26,14 @@ const Carousel = LegacyCarousel as React.ComponentType<CarouselProps>;
 interface Dependencies {
   welcomeMenuItems: IComputedValue<WelcomeMenuRegistration[]>;
   welcomeBannerItems: IComputedValue<WelcomeBannerRegistration[]>;
+  productName: string;
 }
 
-const NonInjectedWelcome = observer(({ welcomeMenuItems, welcomeBannerItems }: Dependencies) => {
+const NonInjectedWelcome = observer(({
+  welcomeMenuItems,
+  welcomeBannerItems,
+  productName,
+}: Dependencies) => {
   const welcomeBanners = welcomeBannerItems.get();
 
   // if there is banner with specified width, use it to calculate the width of the container
@@ -129,5 +135,6 @@ export const Welcome = withInjectables<Dependencies>(NonInjectedWelcome, {
   getProps: (di) => ({
     welcomeMenuItems: di.inject(welcomeMenuItemsInjectable),
     welcomeBannerItems: di.inject(welcomeBannerItemsInjectable),
+    productName: di.inject(productNameInjectable),
   }),
 });
diff --git a/src/renderer/components/+workloads-cronjobs/cronjobs.tsx b/src/renderer/components/+workloads-cronjobs/cronjobs.tsx
index f6c13ba6c0..24eff99303 100644
--- a/src/renderer/components/+workloads-cronjobs/cronjobs.tsx
+++ b/src/renderer/components/+workloads-cronjobs/cronjobs.tsx
@@ -7,14 +7,18 @@ import "./cronjobs.scss";
 
 import React from "react";
 import { observer } from "mobx-react";
-import { cronJobStore } from "./legacy-store";
-import { jobStore } from "../+workloads-jobs/legacy-store";
-import { eventStore } from "../+events/legacy-store";
 import { KubeObjectListLayout } from "../kube-object-list-layout";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import moment from "moment";
 import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout";
 import { KubeObjectAge } from "../kube-object/age";
+import type { CronJobStore } from "./store";
+import type { JobStore } from "../+workloads-jobs/store";
+import type { EventStore } from "../+events/store";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import cronJobStoreInjectable from "./store.injectable";
+import jobStoreInjectable from "../+workloads-jobs/store.injectable";
+import eventStoreInjectable from "../+events/store.injectable";
 
 enum columnId {
   name = "name",
@@ -26,9 +30,21 @@ enum columnId {
   age = "age",
 }
 
+interface Dependencies {
+  cronJobStore: CronJobStore;
+  jobStore: JobStore;
+  eventStore: EventStore;
+}
+
 @observer
-export class CronJobs extends React.Component {
+class NonInjectedCronJobs extends React.Component<Dependencies>{
   render() {
+    const {
+      cronJobStore,
+      eventStore,
+      jobStore,
+    } = this.props;
+
     return (
       <SiblingsInTabLayout>
         <KubeObjectListLayout
@@ -80,3 +96,11 @@ export class CronJobs extends React.Component {
   }
 }
 
+export const CronJobs = withInjectables<Dependencies>(NonInjectedCronJobs, {
+  getProps: (di, props) => ({
+    cronJobStore: di.inject(cronJobStoreInjectable),
+    eventStore: di.inject(eventStoreInjectable),
+    jobStore: di.inject(jobStoreInjectable),
+    ...props,
+  }),
+});
diff --git a/src/renderer/components/+workloads-cronjobs/legacy-store.ts b/src/renderer/components/+workloads-cronjobs/legacy-store.ts
deleted file mode 100644
index 880f8f5b0e..0000000000
--- a/src/renderer/components/+workloads-cronjobs/legacy-store.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { asLegacyGlobalForExtensionApi } from "../../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
-import cronJobStoreInjectable from "./store.injectable";
-
-/**
- * @deprecated use `di.inject(cronJobStoreInjectable)` instead
- */
-export const cronJobStore = asLegacyGlobalForExtensionApi(cronJobStoreInjectable);
diff --git a/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx b/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx
index 0cc16ff6f6..40c6026659 100644
--- a/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx
+++ b/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx
@@ -15,7 +15,7 @@ import { PodDetailsAffinities } from "../+workloads-pods/pod-details-affinities"
 import type { DaemonSetStore } from "./store";
 import type { PodStore } from "../+workloads-pods/store";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
-import { DaemonSet, getMetricsForDaemonSets, type PodMetricData } from "../../../common/k8s-api/endpoints";
+import { DaemonSet } from "../../../common/k8s-api/endpoints";
 import { ResourceMetrics, ResourceMetricsText } from "../resource-metrics";
 import { PodCharts, podMetricTabs } from "../+workloads-pods/pod-charts";
 import { makeObservable, observable, reaction } from "mobx";
@@ -30,6 +30,8 @@ import daemonSetStoreInjectable from "./store.injectable";
 import podStoreInjectable from "../+workloads-pods/store.injectable";
 import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable";
 import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable";
+import type { DaemonSetPodMetricData, RequestPodMetricsForDaemonSets } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-daemon-sets.injectable";
+import requestPodMetricsForDaemonSetsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-daemon-sets.injectable";
 
 export interface DaemonSetDetailsProps extends KubeObjectDetailsProps<DaemonSet> {
 }
@@ -39,11 +41,12 @@ interface Dependencies {
   daemonSetStore: DaemonSetStore;
   podStore: PodStore;
   getActiveClusterEntity: GetActiveClusterEntity;
+  requestPodMetricsForDaemonSets: RequestPodMetricsForDaemonSets;
 }
 
 @observer
 class NonInjectedDaemonSetDetails extends React.Component<DaemonSetDetailsProps & Dependencies> {
-  @observable metrics: PodMetricData | null = null;
+  @observable metrics: DaemonSetPodMetricData | null = null;
 
   constructor(props: DaemonSetDetailsProps & Dependencies) {
     super(props);
@@ -62,9 +65,9 @@ class NonInjectedDaemonSetDetails extends React.Component<DaemonSetDetailsProps
   }
 
   loadMetrics = async () => {
-    const { object: daemonSet } = this.props;
+    const { object: daemonSet, requestPodMetricsForDaemonSets } = this.props;
 
-    this.metrics = await getMetricsForDaemonSets([daemonSet], daemonSet.getNs(), "");
+    this.metrics = await requestPodMetricsForDaemonSets([daemonSet], daemonSet.getNs());
   };
 
   render() {
@@ -143,5 +146,6 @@ export const DaemonSetDetails = withInjectables<Dependencies, DaemonSetDetailsPr
     daemonSetStore: di.inject(daemonSetStoreInjectable),
     podStore: di.inject(podStoreInjectable),
     getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable),
+    requestPodMetricsForDaemonSets: di.inject(requestPodMetricsForDaemonSetsInjectable),
   }),
 });
diff --git a/src/renderer/components/+workloads-deployments/deployment-details.tsx b/src/renderer/components/+workloads-deployments/deployment-details.tsx
index 8e37c09b52..d21d7648d1 100644
--- a/src/renderer/components/+workloads-deployments/deployment-details.tsx
+++ b/src/renderer/components/+workloads-deployments/deployment-details.tsx
@@ -10,8 +10,7 @@ import kebabCase from "lodash/kebabCase";
 import { disposeOnUnmount, observer } from "mobx-react";
 import { DrawerItem } from "../drawer";
 import { Badge } from "../badge";
-import type { PodMetricData } from "../../../common/k8s-api/endpoints";
-import { Deployment, getMetricsForDeployments } from "../../../common/k8s-api/endpoints";
+import { Deployment } from "../../../common/k8s-api/endpoints";
 import { PodDetailsTolerations } from "../+workloads-pods/pod-details-tolerations";
 import { PodDetailsAffinities } from "../+workloads-pods/pod-details-affinities";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
@@ -34,6 +33,8 @@ import replicaSetStoreInjectable from "../+workloads-replicasets/store.injectabl
 import deploymentStoreInjectable from "./store.injectable";
 import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable";
 import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable";
+import type { DeploymentPodMetricData, RequestPodMetricsForDeployments } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-deployments.injectable";
+import requestPodMetricsForDeploymentsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-deployments.injectable";
 
 export interface DeploymentDetailsProps extends KubeObjectDetailsProps<Deployment> {
 }
@@ -44,11 +45,12 @@ interface Dependencies {
   replicaSetStore: ReplicaSetStore;
   deploymentStore: DeploymentStore;
   getActiveClusterEntity: GetActiveClusterEntity;
+  requestPodMetricsForDeployments: RequestPodMetricsForDeployments;
 }
 
 @observer
 class NonInjectedDeploymentDetails extends React.Component<DeploymentDetailsProps & Dependencies> {
-  @observable metrics: PodMetricData | null = null;
+  @observable metrics: DeploymentPodMetricData | null = null;
 
   constructor(props: DeploymentDetailsProps & Dependencies) {
     super(props);
@@ -69,9 +71,9 @@ class NonInjectedDeploymentDetails extends React.Component<DeploymentDetailsProp
   }
 
   loadMetrics = async () => {
-    const { object: deployment } = this.props;
+    const { object: deployment, requestPodMetricsForDeployments } = this.props;
 
-    this.metrics = await getMetricsForDeployments([deployment], deployment.getNs(), "");
+    this.metrics = await requestPodMetricsForDeployments([deployment], deployment.getNs());
   };
 
   render() {
@@ -173,6 +175,7 @@ export const DeploymentDetails = withInjectables<Dependencies, DeploymentDetails
     replicaSetStore: di.inject(replicaSetStoreInjectable),
     deploymentStore: di.inject(deploymentStoreInjectable),
     getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable),
+    requestPodMetricsForDeployments: di.inject(requestPodMetricsForDeploymentsInjectable),
   }),
 });
 
diff --git a/src/renderer/components/+workloads-jobs/job-details.tsx b/src/renderer/components/+workloads-jobs/job-details.tsx
index 24e6f9487e..fbfb272eab 100644
--- a/src/renderer/components/+workloads-jobs/job-details.tsx
+++ b/src/renderer/components/+workloads-jobs/job-details.tsx
@@ -15,7 +15,7 @@ import { PodDetailsTolerations } from "../+workloads-pods/pod-details-toleration
 import { PodDetailsAffinities } from "../+workloads-pods/pod-details-affinities";
 import type { JobStore } from "./store";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
-import { getMetricsForJobs, type PodMetricData, Job } from "../../../common/k8s-api/endpoints";
+import { Job } from "../../../common/k8s-api/endpoints";
 import { PodDetailsList } from "../+workloads-pods/pod-details-list";
 import { KubeObjectMeta } from "../kube-object-meta";
 import { makeObservable, observable, reaction } from "mobx";
@@ -31,6 +31,8 @@ import podStoreInjectable from "../+workloads-pods/store.injectable";
 import jobStoreInjectable from "./store.injectable";
 import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable";
 import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable";
+import type { JobPodMetricData, RequestPodMetricsForJobs } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-jobs.injectable";
+import requestPodMetricsForJobsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-jobs.injectable";
 
 export interface JobDetailsProps extends KubeObjectDetailsProps<Job> {
 }
@@ -40,11 +42,12 @@ interface Dependencies {
   podStore: PodStore;
   jobStore: JobStore;
   getActiveClusterEntity: GetActiveClusterEntity;
+  requestPodMetricsForJobs: RequestPodMetricsForJobs;
 }
 
 @observer
 class NonInjectedJobDetails extends React.Component<JobDetailsProps & Dependencies> {
-  @observable metrics: PodMetricData | null = null;
+  @observable metrics: JobPodMetricData | null = null;
 
   constructor(props: JobDetailsProps & Dependencies) {
     super(props);
@@ -63,9 +66,9 @@ class NonInjectedJobDetails extends React.Component<JobDetailsProps & Dependenci
   }
 
   loadMetrics = async () => {
-    const { object: job } = this.props;
+    const { object: job, requestPodMetricsForJobs } = this.props;
 
-    this.metrics = await getMetricsForJobs([job], job.getNs(), "");
+    this.metrics = await requestPodMetricsForJobs([job], job.getNs(), "");
   };
 
   render() {
@@ -159,6 +162,7 @@ export const JobDetails = withInjectables<Dependencies, JobDetailsProps>(NonInje
     podStore: di.inject(podStoreInjectable),
     jobStore: di.inject(jobStoreInjectable),
     getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable),
+    requestPodMetricsForJobs: di.inject(requestPodMetricsForJobsInjectable),
   }),
 });
 
diff --git a/src/renderer/components/+workloads-pods/pod-details-container.tsx b/src/renderer/components/+workloads-pods/pod-details-container.tsx
index 263192473c..947dec01ac 100644
--- a/src/renderer/components/+workloads-pods/pod-details-container.tsx
+++ b/src/renderer/components/+workloads-pods/pod-details-container.tsx
@@ -105,7 +105,7 @@ class NonInjectedPodDetailsContainer extends React.Component<PodDetailsContainer
           <StatusBrick className={cssNames(state, { ready })}/>
           {name}
         </div>
-        {!isMetricHidden && !isInitContainer && (
+        {(!isMetricHidden && !isInitContainer && metrics) && (
           <ResourceMetrics
             object={pod}
             tabs={[
diff --git a/src/renderer/components/+workloads-pods/pod-details.tsx b/src/renderer/components/+workloads-pods/pod-details.tsx
index d87ce249e0..726c5326b6 100644
--- a/src/renderer/components/+workloads-pods/pod-details.tsx
+++ b/src/renderer/components/+workloads-pods/pod-details.tsx
@@ -10,11 +10,11 @@ import kebabCase from "lodash/kebabCase";
 import { disposeOnUnmount, observer } from "mobx-react";
 import { Link } from "react-router-dom";
 import { observable, reaction, makeObservable } from "mobx";
-import type { PodMetricData } from "../../../common/k8s-api/endpoints";
-import { nodeApi, Pod, getMetricsForPods } from "../../../common/k8s-api/endpoints";
+import { Pod } from "../../../common/k8s-api/endpoints";
+import type { NodeApi, PriorityClassApi, RuntimeClassApi, ServiceAccountApi } from "../../../common/k8s-api/endpoints";
 import { DrawerItem, DrawerTitle } from "../drawer";
 import { Badge } from "../badge";
-import { cssNames, toJS } from "../../utils";
+import { cssNames, stopPropagation, toJS } from "../../utils";
 import { PodDetailsContainer } from "./pod-details-container";
 import { PodDetailsAffinities } from "./pod-details-affinities";
 import { PodDetailsTolerations } from "./pod-details-tolerations";
@@ -24,21 +24,40 @@ import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { getItemMetrics } from "../../../common/k8s-api/endpoints/metrics.api";
 import { PodCharts, podMetricTabs } from "./pod-charts";
 import { KubeObjectMeta } from "../kube-object-meta";
-import { getActiveClusterEntity } from "../../api/catalog/entity/legacy-globals";
 import { ClusterMetricsResourceType } from "../../../common/cluster-types";
-import { getDetailsUrl } from "../kube-detail-params";
 import logger from "../../../common/logger";
 import { PodVolumes } from "./details/volumes/view";
+import type { PodMetricData, RequestPodMetrics } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics.injectable";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import requestPodMetricsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics.injectable";
+import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable";
+import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable";
+import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable";
+import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
+import nodeApiInjectable from "../../../common/k8s-api/endpoints/node.api.injectable";
+import runtimeClassApiInjectable from "../../../common/k8s-api/endpoints/runtime-class.api.injectable";
+import serviceAccountApiInjectable from "../../../common/k8s-api/endpoints/service-account.api.injectable";
+import priorityClassApiInjectable from "../../../common/k8s-api/endpoints/priority-class.api.injectable";
 
 export interface PodDetailsProps extends KubeObjectDetailsProps<Pod> {
 }
 
+interface Dependencies {
+  requestPodMetrics: RequestPodMetrics;
+  getActiveClusterEntity: GetActiveClusterEntity;
+  getDetailsUrl: GetDetailsUrl;
+  nodeApi: NodeApi;
+  priorityClassApi: PriorityClassApi;
+  runtimeClassApi: RuntimeClassApi;
+  serviceAccountApi: ServiceAccountApi;
+}
+
 @observer
-export class PodDetails extends React.Component<PodDetailsProps> {
+class NonInjectedPodDetails extends React.Component<PodDetailsProps & Dependencies> {
   @observable metrics: PodMetricData | null = null;
   @observable containerMetrics: PodMetricData | null = null;
 
-  constructor(props: PodDetailsProps) {
+  constructor(props: PodDetailsProps & Dependencies) {
     super(props);
     makeObservable(this);
   }
@@ -53,14 +72,14 @@ export class PodDetails extends React.Component<PodDetailsProps> {
   }
 
   loadMetrics = async () => {
-    const { object: pod } = this.props;
+    const { object: pod, requestPodMetrics } = this.props;
 
-    this.metrics = await getMetricsForPods([pod], pod.getNs());
-    this.containerMetrics = await getMetricsForPods([pod], pod.getNs(), "container, namespace");
+    this.metrics = await requestPodMetrics([pod], pod.getNs());
+    this.containerMetrics = await requestPodMetrics([pod], pod.getNs(), "container, namespace");
   };
 
   render() {
-    const { object: pod } = this.props;
+    const { object: pod, getActiveClusterEntity, getDetailsUrl, nodeApi } = this.props;
 
     if (!pod) {
       return null;
@@ -81,6 +100,22 @@ export class PodDetails extends React.Component<PodDetailsProps> {
     const initContainers = pod.getInitContainers();
     const containers = pod.getContainers();
 
+    const namespace = pod.getNs();
+    const priorityClassName = pod.getPriorityClassName();
+    const runtimeClassName = pod.getRuntimeClassName();
+    const serviceAccountName = pod.getServiceAccountName();
+
+    const priorityClassDetailsUrl = getDetailsUrl(this.props.priorityClassApi.getUrl({
+      name: priorityClassName,
+    }));
+    const runtimeClassDetailsUrl = getDetailsUrl(this.props.runtimeClassApi.getUrl({
+      name: runtimeClassName,
+    }));
+    const serviceAccountDetailsUrl = getDetailsUrl(this.props.serviceAccountApi.getUrl({
+      name: serviceAccountName,
+      namespace,
+    }));
+
     return (
       <div className="PodDetails">
         {!isMetricHidden && (
@@ -117,14 +152,35 @@ export class PodDetails extends React.Component<PodDetailsProps> {
           {podIPs.map(label => <Badge key={label} label={label} />)}
         </DrawerItem>
         <DrawerItem name="Service Account">
-          {pod.getServiceAccountName()}
+          <Link
+            key="link"
+            to={serviceAccountDetailsUrl}
+            onClick={stopPropagation}
+          >
+            {serviceAccountName}
+          </Link>
         </DrawerItem>
-        <DrawerItem name="Priority Class">
-          {pod.getPriorityClassName()}
+        <DrawerItem name="Priority Class" hidden={priorityClassName === ""}>
+          <Link
+            key="link"
+            to={priorityClassDetailsUrl}
+            onClick={stopPropagation}
+          >
+            {priorityClassName}
+          </Link>
         </DrawerItem>
         <DrawerItem name="QoS Class">
           {pod.getQosClass()}
         </DrawerItem>
+        <DrawerItem name="Runtime Class" hidden={runtimeClassName === ""}>
+          <Link
+            key="link"
+            to={runtimeClassDetailsUrl}
+            onClick={stopPropagation}
+          >
+            {runtimeClassName}
+          </Link>
+        </DrawerItem>
 
         <DrawerItem
           name="Conditions"
@@ -183,3 +239,16 @@ export class PodDetails extends React.Component<PodDetailsProps> {
     );
   }
 }
+
+export const PodDetails = withInjectables<Dependencies, PodDetailsProps>(NonInjectedPodDetails, {
+  getProps: (di, props) => ({
+    ...props,
+    requestPodMetrics: di.inject(requestPodMetricsInjectable),
+    getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable),
+    getDetailsUrl: di.inject(getDetailsUrlInjectable),
+    nodeApi: di.inject(nodeApiInjectable),
+    priorityClassApi: di.inject(priorityClassApiInjectable),
+    runtimeClassApi: di.inject(runtimeClassApiInjectable),
+    serviceAccountApi: di.inject(serviceAccountApiInjectable),
+  }),
+});
diff --git a/src/renderer/components/+workloads-replicasets/replicaset-details.tsx b/src/renderer/components/+workloads-replicasets/replicaset-details.tsx
index 6f239f3dbb..cf92b7976c 100644
--- a/src/renderer/components/+workloads-replicasets/replicaset-details.tsx
+++ b/src/renderer/components/+workloads-replicasets/replicaset-details.tsx
@@ -13,8 +13,7 @@ import { PodDetailsTolerations } from "../+workloads-pods/pod-details-toleration
 import { PodDetailsAffinities } from "../+workloads-pods/pod-details-affinities";
 import { disposeOnUnmount, observer } from "mobx-react";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
-import type { PodMetricData } from "../../../common/k8s-api/endpoints";
-import { getMetricsForReplicaSets, ReplicaSet } from "../../../common/k8s-api/endpoints";
+import { ReplicaSet } from "../../../common/k8s-api/endpoints";
 import { ResourceMetrics, ResourceMetricsText } from "../resource-metrics";
 import { PodCharts, podMetricTabs } from "../+workloads-pods/pod-charts";
 import { PodDetailsList } from "../+workloads-pods/pod-details-list";
@@ -30,6 +29,8 @@ import type { ReplicaSetStore } from "./store";
 import replicaSetStoreInjectable from "./store.injectable";
 import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable";
 import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable";
+import type { ReplicaSetPodMetricData, RequestPodMetricsForReplicaSets } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-replica-sets.injectable";
+import requestPodMetricsForReplicaSetsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-replica-sets.injectable";
 
 export interface ReplicaSetDetailsProps extends KubeObjectDetailsProps<ReplicaSet> {
 }
@@ -39,11 +40,12 @@ interface Dependencies {
   podStore: PodStore;
   replicaSetStore: ReplicaSetStore;
   getActiveClusterEntity: GetActiveClusterEntity;
+  requestPodMetricsForReplicaSets: RequestPodMetricsForReplicaSets;
 }
 
 @observer
 class NonInjectedReplicaSetDetails extends React.Component<ReplicaSetDetailsProps & Dependencies> {
-  @observable metrics: PodMetricData | null = null;
+  @observable metrics: ReplicaSetPodMetricData | null = null;
 
   constructor(props: ReplicaSetDetailsProps & Dependencies) {
     super(props);
@@ -63,9 +65,9 @@ class NonInjectedReplicaSetDetails extends React.Component<ReplicaSetDetailsProp
   }
 
   loadMetrics = async () => {
-    const { object: replicaSet } = this.props;
+    const { object: replicaSet, requestPodMetricsForReplicaSets } = this.props;
 
-    this.metrics = await getMetricsForReplicaSets([replicaSet], replicaSet.getNs(), "");
+    this.metrics = await requestPodMetricsForReplicaSets([replicaSet], replicaSet.getNs());
   };
 
   render() {
@@ -144,5 +146,6 @@ export const ReplicaSetDetails = withInjectables<Dependencies, ReplicaSetDetails
     podStore: di.inject(podStoreInjectable),
     replicaSetStore: di.inject(replicaSetStoreInjectable),
     getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable),
+    requestPodMetricsForReplicaSets: di.inject(requestPodMetricsForReplicaSetsInjectable),
   }),
 });
diff --git a/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx b/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx
index e89dc88f7a..83fb856619 100644
--- a/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx
+++ b/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx
@@ -15,8 +15,7 @@ import { PodDetailsTolerations } from "../+workloads-pods/pod-details-toleration
 import { PodDetailsAffinities } from "../+workloads-pods/pod-details-affinities";
 import type { StatefulSetStore } from "./store";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
-import type { PodMetricData } from "../../../common/k8s-api/endpoints";
-import { getMetricsForStatefulSets, StatefulSet } from "../../../common/k8s-api/endpoints";
+import { StatefulSet } from "../../../common/k8s-api/endpoints";
 import { ResourceMetrics, ResourceMetricsText } from "../resource-metrics";
 import { PodCharts, podMetricTabs } from "../+workloads-pods/pod-charts";
 import { PodDetailsList } from "../+workloads-pods/pod-details-list";
@@ -31,6 +30,8 @@ import podStoreInjectable from "../+workloads-pods/store.injectable";
 import statefulSetStoreInjectable from "./store.injectable";
 import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable";
 import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable";
+import type { RequestPodMetricsForStatefulSets, StatefulSetPodMetricData } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-stateful-sets.injectable";
+import requestPodMetricsForStatefulSetsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-stateful-sets.injectable";
 
 export interface StatefulSetDetailsProps extends KubeObjectDetailsProps<StatefulSet> {
 }
@@ -40,11 +41,12 @@ interface Dependencies {
   podStore: PodStore;
   statefulSetStore: StatefulSetStore;
   getActiveClusterEntity: GetActiveClusterEntity;
+  requestPodMetricsForStatefulSets: RequestPodMetricsForStatefulSets;
 }
 
 @observer
 class NonInjectedStatefulSetDetails extends React.Component<StatefulSetDetailsProps & Dependencies> {
-  @observable metrics: PodMetricData | null = null;
+  @observable metrics: StatefulSetPodMetricData | null = null;
 
   constructor(props: StatefulSetDetailsProps & Dependencies) {
     super(props);
@@ -64,9 +66,9 @@ class NonInjectedStatefulSetDetails extends React.Component<StatefulSetDetailsPr
   }
 
   loadMetrics = async () => {
-    const { object: statefulSet } = this.props;
+    const { object: statefulSet, requestPodMetricsForStatefulSets } = this.props;
 
-    this.metrics = await getMetricsForStatefulSets([statefulSet], statefulSet.getNs(), "");
+    this.metrics = await requestPodMetricsForStatefulSets([statefulSet], statefulSet.getNs());
   };
 
   render() {
@@ -143,6 +145,7 @@ export const StatefulSetDetails = withInjectables<Dependencies, StatefulSetDetai
     podStore: di.inject(podStoreInjectable),
     statefulSetStore: di.inject(statefulSetStoreInjectable),
     getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable),
+    requestPodMetricsForStatefulSets: di.inject(requestPodMetricsForStatefulSetsInjectable),
   }),
 });
 
diff --git a/src/renderer/components/animate/animate.tsx b/src/renderer/components/animate/animate.tsx
index d642a41fa8..aa0d673570 100644
--- a/src/renderer/components/animate/animate.tsx
+++ b/src/renderer/components/animate/animate.tsx
@@ -4,12 +4,13 @@
  */
 
 import "./animate.scss";
-import React from "react";
-import { observable, makeObservable } from "mobx";
-import { observer } from "mobx-react";
+import React, { useEffect, useState } from "react";
 import { cssNames, noop } from "../../utils";
 import { withInjectables } from "@ogre-tools/injectable-react";
+import type { RequestAnimationFrame } from "./request-animation-frame.injectable";
 import requestAnimationFrameInjectable from "./request-animation-frame.injectable";
+import defaultEnterDurationForAnimatedInjectable from "./default-enter-duration.injectable";
+import defaultLeaveDurationForAnimatedInjectable from "./default-leave-duration.injectable";
 
 export type AnimateName = "opacity" | "slide-right" | "opacity-scale" | string;
 
@@ -24,115 +25,89 @@ export interface AnimateProps {
 }
 
 interface Dependencies {
-  requestAnimationFrame: (callback: () => void) => void;
+  requestAnimationFrame: RequestAnimationFrame;
+  defaultEnterDuration: number;
+  defaultLeaveDuration: number;
 }
 
-@observer
-class DefaultedAnimate extends React.Component<AnimateProps & Dependencies & typeof DefaultedAnimate.defaultProps> {
-  static defaultProps = {
-    name: "opacity",
-    enter: true,
-    onEnter: noop,
-    onLeave: noop,
-    enterDuration: 100,
-    leaveDuration: 100,
-  };
+const NonInjectedAnimate = (propsAndDeps: AnimateProps & Dependencies) => {
+  const {
+    requestAnimationFrame,
+    defaultEnterDuration,
+    defaultLeaveDuration,
+    ...props
+  } = propsAndDeps;
+  const {
+    children,
+    enter = true,
+    enterDuration = defaultEnterDuration,
+    leaveDuration = defaultLeaveDuration,
+    name = "opacity",
+    onEnter: onEnterHandler = noop<[]>,
+    onLeave: onLeaveHandler = noop<[]>,
+  } = props;
 
-  @observable isVisible = !!this.props.enter;
-  @observable statusClassName = {
-    enter: false,
-    leave: false,
-  };
+  const [isVisible, setIsVisible] = useState(false);
+  const [showClassNameEnter, setShowClassNameEnter] = useState(false);
+  const [showClassNameLeave, setShowClassNameLeave] = useState(false);
 
-  constructor(props: AnimateProps & Dependencies & typeof DefaultedAnimate.defaultProps) {
-    super(props);
-    makeObservable(this);
-  }
+  const contentElem = React.Children.only(children) as React.ReactElement<React.HTMLAttributes<any>>;
+  const classNames = cssNames("Animate", name, contentElem.props.className, {
+    enter: showClassNameEnter,
+    leave: showClassNameLeave,
+  });
 
-  get contentElem() {
-    return React.Children.only(this.props.children) as React.ReactElement<React.HTMLAttributes<any>>;
-  }
-
-  private toggle(enter: boolean) {
+  useEffect(() => {
     if (enter) {
-      this.enter();
-    } else {
-      this.leave();
-    }
-  }
+      setIsVisible(true);
 
-  componentDidMount() {
-    this.toggle(this.props.enter);
-  }
+      requestAnimationFrame(() => {
+        setShowClassNameEnter(true);
+        onEnterHandler();
+      });
 
-  componentDidUpdate(prevProps: Readonly<AnimateProps>): void {
-    const { enter } = this.props;
+      return noop;
+    } else if (isVisible) {
+      setShowClassNameLeave(true);
+      onLeaveHandler();
 
-    if (prevProps.enter !== enter) {
-      this.toggle(enter);
-    }
-  }
+      // Cleanup after duration
+      const handle = setTimeout(() => {
+        setIsVisible(false);
+        setShowClassNameEnter(false);
+        setShowClassNameLeave(false);
+      }, leaveDuration);
 
-  enter() {
-    this.isVisible = true; // triggers render() to apply css-animation in existing dom
-
-    this.props.requestAnimationFrame(() => {
-      this.statusClassName.enter = true;
-      this.props.onEnter();
-    });
-  }
-
-  leave() {
-    if (!this.isVisible) return;
-    this.statusClassName.leave = true;
-    this.props.onLeave();
-    this.resetAfterLeaveDuration();
-  }
-
-  resetAfterLeaveDuration() {
-    setTimeout(() => this.reset(), this.props.leaveDuration);
-  }
-
-  reset() {
-    this.isVisible = false;
-    this.statusClassName.enter = false;
-    this.statusClassName.leave = false;
-  }
-
-  render() {
-    if (!this.isVisible) {
-      return null;
+      return () => clearTimeout(handle);
     }
 
-    const { name, enterDuration, leaveDuration } = this.props;
-    const contentElem = this.contentElem;
-    const cssVarsForAnimation = {
-      "--enter-duration": `${enterDuration}ms`,
-      "--leave-duration": `${leaveDuration}ms`,
-    } as React.CSSProperties;
+    return noop;
+  }, [enter]);
 
-    return React.cloneElement(contentElem, {
-      className: cssNames("Animate", name, contentElem.props.className, this.statusClassName),
-      children: contentElem.props.children,
-      style: {
-        ...contentElem.props.style,
-        ...cssVarsForAnimation,
-      },
-    });
+  if (!isVisible) {
+    return null;
   }
-}
 
-export const NonInjectedAnimate = (props: AnimateProps & Dependencies) => <DefaultedAnimate {...props} />;
-
-export const Animate = withInjectables<Dependencies, AnimateProps>(
-  NonInjectedAnimate,
-
-  {
-    getProps: (di, props) => ({
-      requestAnimationFrame: di.inject(requestAnimationFrameInjectable),
-      ...props,
-    }),
-  },
-);
+  const cssVarsForAnimation = {
+    "--enter-duration": `${enterDuration}ms`,
+    "--leave-duration": `${leaveDuration}ms`,
+  } as React.CSSProperties;
 
+  return React.cloneElement(contentElem, {
+    className: classNames,
+    children: contentElem.props.children,
+    style: {
+      ...contentElem.props.style,
+      ...cssVarsForAnimation,
+    },
+  });
+};
 
+export const Animate = withInjectables<Dependencies, AnimateProps>(NonInjectedAnimate, {
+  getProps: (di, props) => ({
+    ...props,
+    requestAnimationFrame: di.inject(requestAnimationFrameInjectable),
+    defaultEnterDuration: di.inject(defaultEnterDurationForAnimatedInjectable),
+    defaultLeaveDuration: di.inject(defaultLeaveDurationForAnimatedInjectable),
+  }),
+});
diff --git a/src/renderer/components/animate/default-enter-duration.injectable.ts b/src/renderer/components/animate/default-enter-duration.injectable.ts
new file mode 100644
index 0000000000..c28f8a3346
--- /dev/null
+++ b/src/renderer/components/animate/default-enter-duration.injectable.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+
+const defaultEnterDurationForAnimatedInjectable = getInjectable({
+  id: "default-enter-duration-for-animated",
+  instantiate: () => 100,
+});
+
+export default defaultEnterDurationForAnimatedInjectable;
diff --git a/src/renderer/components/animate/default-leave-duration.injectable.ts b/src/renderer/components/animate/default-leave-duration.injectable.ts
new file mode 100644
index 0000000000..01193151ab
--- /dev/null
+++ b/src/renderer/components/animate/default-leave-duration.injectable.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+
+const defaultLeaveDurationForAnimatedInjectable = getInjectable({
+  id: "default-leave-duration-for-animated",
+  instantiate: () => 100,
+});
+
+export default defaultLeaveDurationForAnimatedInjectable;
diff --git a/src/renderer/components/animate/request-animation-frame.injectable.ts b/src/renderer/components/animate/request-animation-frame.injectable.ts
index f61b2ae874..c04fa3a72e 100644
--- a/src/renderer/components/animate/request-animation-frame.injectable.ts
+++ b/src/renderer/components/animate/request-animation-frame.injectable.ts
@@ -4,9 +4,12 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 
+export type RequestAnimationFrame = (callback: () => void) => void;
+
 const requestAnimationFrameInjectable = getInjectable({
   id: "request-animation-frame",
-  instantiate: () => (callback: () => void) => requestAnimationFrame(callback),
+  // NOTE: this cannot be simplified to just `=> requestAnimationFrame` else an Illegal Invocation error will be thrown
+  instantiate: (): RequestAnimationFrame => (callback) => requestAnimationFrame(callback),
   causesSideEffects: true,
 });
 
diff --git a/src/renderer/components/app.scss b/src/renderer/components/app.scss
index 19c7b53d6f..434159eee0 100755
--- a/src/renderer/components/app.scss
+++ b/src/renderer/components/app.scss
@@ -7,7 +7,7 @@
 @tailwind components;
 @tailwind utilities;
 
-@import "~flex.box";
+@import "./flexbox";
 @import "../themes/theme-vars";
 @import "./fonts";
 
diff --git a/src/renderer/components/avatar/__tests__/avatar.test.tsx b/src/renderer/components/avatar/__tests__/avatar.test.tsx
index 4b7b3e18c0..82f4591ff9 100644
--- a/src/renderer/components/avatar/__tests__/avatar.test.tsx
+++ b/src/renderer/components/avatar/__tests__/avatar.test.tsx
@@ -5,11 +5,20 @@
 
 import React from "react";
 import "@testing-library/jest-dom/extend-expect";
-import { render } from "@testing-library/react";
 import { Avatar } from "../avatar";
 import { Icon } from "../../icon";
+import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
+import { type DiRender, renderFor } from "../../test-utils/renderFor";
 
 describe("<Avatar/>", () => {
+  let render: DiRender;
+
+  beforeEach(() => {
+    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    render = renderFor(di);
+  });
+
   test("renders w/o errors", () => {
     const { container } = render(<Avatar title="John Ferguson"/>);
 
diff --git a/src/renderer/components/cluster-manager/cluster-frame-handler.injectable.ts b/src/renderer/components/cluster-manager/cluster-frame-handler.injectable.ts
index 19611f3117..3f40455527 100644
--- a/src/renderer/components/cluster-manager/cluster-frame-handler.injectable.ts
+++ b/src/renderer/components/cluster-manager/cluster-frame-handler.injectable.ts
@@ -3,11 +3,18 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
+import getClusterByIdInjectable from "../../../common/cluster-store/get-by-id.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import { ClusterFrameHandler } from "./cluster-frame-handler";
+import emitClusterVisibilityInjectable from "./emit-cluster-visibility.injectable";
 
 const clusterFrameHandlerInjectable = getInjectable({
   id: "cluster-frame-handler",
-  instantiate: () => new ClusterFrameHandler(),
+  instantiate: (di) => new ClusterFrameHandler({
+    emitClusterVisibility: di.inject(emitClusterVisibilityInjectable),
+    getClusterById: di.inject(getClusterByIdInjectable),
+    logger: di.inject(loggerInjectable),
+  }),
 });
 
 export default clusterFrameHandlerInjectable;
diff --git a/src/renderer/components/cluster-manager/cluster-frame-handler.ts b/src/renderer/components/cluster-manager/cluster-frame-handler.ts
index 7791837e0d..d7d298dd80 100644
--- a/src/renderer/components/cluster-manager/cluster-frame-handler.ts
+++ b/src/renderer/components/cluster-manager/cluster-frame-handler.ts
@@ -4,24 +4,29 @@
  */
 
 import { action, makeObservable, observable, when } from "mobx";
-import logger from "../../../main/logger";
-import { clusterVisibilityHandler } from "../../../common/ipc/cluster";
-import { ClusterStore } from "../../../common/cluster-store/cluster-store";
 import type { ClusterId } from "../../../common/cluster-types";
 import type { Disposer } from "../../utils";
 import { getClusterFrameUrl, onceDefined } from "../../utils";
-import { ipcRenderer } from "electron";
 import assert from "assert";
+import type { Logger } from "../../../common/logger";
+import type { GetClusterById } from "../../../common/cluster-store/get-by-id.injectable";
+import type { EmitClusterVisibility } from "./emit-cluster-visibility.injectable";
 
 export interface LensView {
   isLoaded: boolean;
   frame: HTMLIFrameElement;
 }
 
+interface Dependencies {
+  readonly logger: Logger;
+  getClusterById: GetClusterById;
+  emitClusterVisibility: EmitClusterVisibility;
+}
+
 export class ClusterFrameHandler {
   private readonly views = observable.map<string, LensView>();
 
-  constructor() {
+  constructor(protected readonly dependencies: Dependencies) {
     makeObservable(this);
   }
 
@@ -31,7 +36,7 @@ export class ClusterFrameHandler {
 
   @action
   public initView(clusterId: ClusterId) {
-    const cluster = ClusterStore.getInstance().getById(clusterId);
+    const cluster = this.dependencies.getClusterById(clusterId);
     const parentElem = document.getElementById("lens-views");
 
     assert(parentElem, "DOM with #lens-views must be present");
@@ -40,14 +45,14 @@ export class ClusterFrameHandler {
       return;
     }
 
-    logger.info(`[LENS-VIEW]: init dashboard, clusterId=${clusterId}`);
+    this.dependencies.logger.info(`[LENS-VIEW]: init dashboard, clusterId=${clusterId}`);
     const iframe = document.createElement("iframe");
 
     iframe.id = `cluster-frame-${cluster.id}`;
     iframe.name = cluster.contextName;
     iframe.setAttribute("src", getClusterFrameUrl(clusterId));
     iframe.addEventListener("load", action(() => {
-      logger.info(`[LENS-VIEW]: frame for clusterId=${clusterId} has loaded`);
+      this.dependencies.logger.info(`[LENS-VIEW]: frame for clusterId=${clusterId} has loaded`);
       const view = this.views.get(clusterId);
 
       assert(view, `view for ${clusterId} MUST still exist here`);
@@ -56,11 +61,11 @@ export class ClusterFrameHandler {
     this.views.set(clusterId, { frame: iframe, isLoaded: false });
     parentElem.appendChild(iframe);
 
-    logger.info(`[LENS-VIEW]: waiting cluster to be ready, clusterId=${clusterId}`);
+    this.dependencies.logger.info(`[LENS-VIEW]: waiting cluster to be ready, clusterId=${clusterId}`);
 
     const dispose = when(
       () => cluster.ready,
-      () => logger.info(`[LENS-VIEW]: cluster is ready, clusterId=${clusterId}`),
+      () => this.dependencies.logger.info(`[LENS-VIEW]: cluster is ready, clusterId=${clusterId}`),
     );
 
     when(
@@ -69,12 +74,12 @@ export class ClusterFrameHandler {
       () => {
         when(
           () => {
-            const cluster = ClusterStore.getInstance().getById(clusterId);
+            const cluster = this.dependencies.getClusterById(clusterId);
 
             return Boolean(!cluster || (cluster.disconnected && this.views.get(clusterId)?.isLoaded));
           },
           () => {
-            logger.info(`[LENS-VIEW]: remove dashboard, clusterId=${clusterId}`);
+            this.dependencies.logger.info(`[LENS-VIEW]: remove dashboard, clusterId=${clusterId}`);
             this.views.delete(clusterId);
             parentElem.removeChild(iframe);
             dispose();
@@ -86,19 +91,19 @@ export class ClusterFrameHandler {
 
   private prevVisibleClusterChange?: Disposer;
 
-  public setVisibleCluster(clusterId: ClusterId | null) {
+  public setVisibleCluster(clusterId: ClusterId | null): void {
     // Clear the previous when ASAP
     this.prevVisibleClusterChange?.();
 
-    logger.info(`[LENS-VIEW]: refreshing iframe views, visible cluster id=${clusterId}`);
-    ipcRenderer.send(clusterVisibilityHandler);
+    this.dependencies.logger.info(`[LENS-VIEW]: refreshing iframe views, visible cluster id=${clusterId}`);
+    this.dependencies.emitClusterVisibility(null);
 
     for (const { frame: view } of this.views.values()) {
       view.classList.add("hidden");
     }
 
     const cluster = clusterId
-      ? ClusterStore.getInstance().getById(clusterId)
+      ? this.dependencies.getClusterById(clusterId)
       : undefined;
 
     if (cluster && clusterId) {
@@ -113,10 +118,10 @@ export class ClusterFrameHandler {
           return undefined;
         },
         (view: LensView) => {
-          logger.info(`[LENS-VIEW]: cluster id=${clusterId} should now be visible`);
+          this.dependencies.logger.info(`[LENS-VIEW]: cluster id=${clusterId} should now be visible`);
           view.frame.classList.remove("hidden");
           view.frame.focus();
-          ipcRenderer.send(clusterVisibilityHandler, clusterId);
+          this.dependencies.emitClusterVisibility(clusterId);
         },
       );
     }
diff --git a/src/renderer/components/cluster-manager/cluster-manager.scss b/src/renderer/components/cluster-manager/cluster-manager.scss
index dec5a069a2..7644d1f4d3 100644
--- a/src/renderer/components/cluster-manager/cluster-manager.scss
+++ b/src/renderer/components/cluster-manager/cluster-manager.scss
@@ -19,12 +19,17 @@
     position: relative;
     display: flex;
     flex-direction: column;
+    overflow-y: auto;
   }
 
   .HotbarMenu {
     grid-area: menu;
   }
 
+  .error {
+    z-index: 1;
+  }
+
   #lens-views {
     position: absolute;
     left: 0;
diff --git a/src/renderer/components/cluster-manager/cluster-manager.tsx b/src/renderer/components/cluster-manager/cluster-manager.tsx
index 85fb8a80c0..ab418ec827 100644
--- a/src/renderer/components/cluster-manager/cluster-manager.tsx
+++ b/src/renderer/components/cluster-manager/cluster-manager.tsx
@@ -21,12 +21,14 @@ import { buildURL } from "../../../common/utils/buildUrl";
 import type { StorageLayer } from "../../utils";
 import type { WatchForGeneralEntityNavigation } from "../../api/helpers/watch-for-general-entity-navigation.injectable";
 import watchForGeneralEntityNavigationInjectable from "../../api/helpers/watch-for-general-entity-navigation.injectable";
+import currentPathInjectable from "../../routes/current-path.injectable";
 
 interface Dependencies {
   catalogPreviousActiveTabStorage: StorageLayer<string | null>;
   currentRouteComponent: IComputedValue<React.ElementType | undefined>;
   welcomeUrl: string;
   watchForGeneralEntityNavigation: WatchForGeneralEntityNavigation;
+  currentPath: IComputedValue<string>;
 }
 
 @observer
@@ -37,19 +39,40 @@ class NonInjectedClusterManager extends React.Component<Dependencies> {
     ]);
   }
 
-  render() {
+  renderMainComponent() {
     const Component = this.props.currentRouteComponent.get();
 
-    if (!Component) {
+    if (Component) {
+      return <Component />;
+    }
+
+    const currentPath = this.props.currentPath.get();
+
+    if (currentPath !== this.props.welcomeUrl) {
       return <Redirect exact to={this.props.welcomeUrl} />;
     }
 
+    return (
+      <div className="error">
+        <h2>ERROR!!</h2>
+        <p>
+          No matching route for the current path:
+          {" "}
+          <code>{currentPath}</code>
+          {" "}
+          which is the welcomeUrl. This is a bug.
+        </p>
+      </div>
+    );
+  }
+
+  render() {
     return (
       <div className="ClusterManager">
         <TopBar />
         <main>
           <div id="lens-views" />
-          <Component />
+          {this.renderMainComponent()}
         </main>
         <HotbarMenu />
         <StatusBar />
@@ -65,5 +88,6 @@ export const ClusterManager = withInjectables<Dependencies>(NonInjectedClusterMa
     currentRouteComponent: di.inject(currentRouteComponentInjectable),
     welcomeUrl: buildURL(di.inject(welcomeRouteInjectable).path),
     watchForGeneralEntityNavigation: di.inject(watchForGeneralEntityNavigationInjectable),
+    currentPath: di.inject(currentPathInjectable),
   }),
 });
diff --git a/src/renderer/components/cluster-manager/emit-cluster-visibility.injectable.ts b/src/renderer/components/cluster-manager/emit-cluster-visibility.injectable.ts
new file mode 100644
index 0000000000..261582d136
--- /dev/null
+++ b/src/renderer/components/cluster-manager/emit-cluster-visibility.injectable.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { MessageChannelHandler } from "../../../common/utils/channel/message-channel-listener-injection-token";
+import { sendMessageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
+import { clusterVisibilityChannel } from "../../../common/cluster/visibility-channel";
+
+export type EmitClusterVisibility = MessageChannelHandler<typeof clusterVisibilityChannel>;
+
+const emitClusterVisibilityInjectable = getInjectable({
+  id: "emit-cluster-visibility",
+  instantiate: (di): EmitClusterVisibility => {
+    const sendMessageToChannel = di.inject(sendMessageToChannelInjectionToken);
+
+    return (id) => sendMessageToChannel(clusterVisibilityChannel, id);
+  },
+});
+
+export default emitClusterVisibilityInjectable;
diff --git a/src/renderer/components/cluster-settings/components/cluster-local-terminal-settings.tsx b/src/renderer/components/cluster-settings/components/cluster-local-terminal-settings.tsx
index 3a5c1c4d2d..639623e08f 100644
--- a/src/renderer/components/cluster-settings/components/cluster-local-terminal-settings.tsx
+++ b/src/renderer/components/cluster-settings/components/cluster-local-terminal-settings.tsx
@@ -9,7 +9,6 @@ import type { Cluster } from "../../../../common/cluster/cluster";
 import { Input } from "../../input";
 import { SubTitle } from "../../layout/sub-title";
 import type { ShowNotification } from "../../notifications";
-import { resolveTilde } from "../../../utils";
 import { Icon } from "../../icon";
 import { PathPicker } from "../../path-picker";
 import { isWindows } from "../../../../common/vars";
@@ -17,6 +16,9 @@ import { withInjectables } from "@ogre-tools/injectable-react";
 import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable";
 import type { ValidateDirectory } from "../../../../common/fs/validate-directory.injectable";
 import validateDirectoryInjectable from "../../../../common/fs/validate-directory.injectable";
+import type { ResolveTilde } from "../../../../common/path/resolve-tilde.injectable";
+import resolveTildeInjectable from "../../../../common/path/resolve-tilde.injectable";
+import Gutter from "../../gutter/gutter";
 
 export interface ClusterLocalTerminalSettingProps {
   cluster: Cluster;
@@ -24,9 +26,15 @@ export interface ClusterLocalTerminalSettingProps {
 interface Dependencies {
   showErrorNotification: ShowNotification;
   validateDirectory: ValidateDirectory;
+  resolveTilde: ResolveTilde;
 }
 
-const NonInjectedClusterLocalTerminalSetting = observer(({ cluster, showErrorNotification, validateDirectory }: Dependencies & ClusterLocalTerminalSettingProps) => {
+const NonInjectedClusterLocalTerminalSetting = observer(({
+  cluster,
+  showErrorNotification,
+  validateDirectory,
+  resolveTilde,
+}: Dependencies & ClusterLocalTerminalSettingProps) => {
   if (!cluster) {
     return null;
   }
@@ -132,6 +140,7 @@ const NonInjectedClusterLocalTerminalSetting = observer(({ cluster, showErrorNot
           this is used as the current working directory (cwd) for the shell process.
         </small>
       </section>
+      <Gutter />
       <section className="default-namespace">
         <SubTitle title="Default Namespace"/>
         <Input
@@ -150,15 +159,11 @@ const NonInjectedClusterLocalTerminalSetting = observer(({ cluster, showErrorNot
   );
 });
 
-export const ClusterLocalTerminalSetting = withInjectables<Dependencies, ClusterLocalTerminalSettingProps>(
-  NonInjectedClusterLocalTerminalSetting,
-
-  {
-    getProps: (di, props) => ({
-      showErrorNotification: di.inject(showErrorNotificationInjectable),
-      validateDirectory: di.inject(validateDirectoryInjectable),
-      ...props,
-    }),
-  },
-);
-
+export const ClusterLocalTerminalSetting = withInjectables<Dependencies, ClusterLocalTerminalSettingProps>(NonInjectedClusterLocalTerminalSetting, {
+  getProps: (di, props) => ({
+    ...props,
+    showErrorNotification: di.inject(showErrorNotificationInjectable),
+    validateDirectory: di.inject(validateDirectoryInjectable),
+    resolveTilde: di.inject(resolveTildeInjectable),
+  }),
+});
diff --git a/src/renderer/components/cluster-settings/components/cluster-node-shell-setting.tsx b/src/renderer/components/cluster-settings/components/cluster-node-shell-setting.tsx
index f21b725226..e67e9d4748 100644
--- a/src/renderer/components/cluster-settings/components/cluster-node-shell-setting.tsx
+++ b/src/renderer/components/cluster-settings/components/cluster-node-shell-setting.tsx
@@ -11,6 +11,7 @@ import { Input } from "../../input/input";
 import { observer } from "mobx-react";
 import { Icon } from "../../icon/icon";
 import { initialNodeShellImage } from "../../../../common/cluster-types";
+import Gutter from "../../gutter/gutter";
 
 export interface ClusterNodeShellSettingProps {
   cluster: Cluster;
@@ -59,6 +60,7 @@ export class ClusterNodeShellSetting extends React.Component<ClusterNodeShellSet
             Node shell image. Used for creating node shell pod.
           </small>
         </section>
+        <Gutter />
         <section>
           <SubTitle title="Image pull secret" id="image-pull-secret"/>
           <Input
diff --git a/src/renderer/components/cluster-settings/components/cluster-prometheus-setting.tsx b/src/renderer/components/cluster-settings/components/cluster-prometheus-setting.tsx
index ad777248ad..0a07aa030a 100644
--- a/src/renderer/components/cluster-settings/components/cluster-prometheus-setting.tsx
+++ b/src/renderer/components/cluster-settings/components/cluster-prometheus-setting.tsx
@@ -11,10 +11,11 @@ import type { SelectOption } from "../../select";
 import { Select } from "../../select";
 import { Input } from "../../input";
 import { observable, computed, autorun, makeObservable } from "mobx";
-import { productName } from "../../../../common/vars";
-import type { MetricProviderInfo } from "../../../../common/k8s-api/endpoints/metrics.api";
-import { metricsApi } from "../../../../common/k8s-api/endpoints/metrics.api";
 import { Spinner } from "../../spinner";
+import type { MetricProviderInfo, RequestMetricsProviders } from "../../../../common/k8s-api/endpoints/metrics.api/request-providers.injectable";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import requestMetricsProvidersInjectable from "../../../../common/k8s-api/endpoints/metrics.api/request-providers.injectable";
+import productNameInjectable from "../../../../common/vars/product-name.injectable";
 
 export interface ClusterPrometheusSettingProps {
   cluster: Cluster;
@@ -24,8 +25,13 @@ const autoDetectPrometheus = Symbol("auto-detect-prometheus");
 
 type ProviderValue = typeof autoDetectPrometheus | string;
 
+interface Dependencies {
+  productName: string;
+  requestMetricsProviders: RequestMetricsProviders;
+}
+
 @observer
-export class ClusterPrometheusSetting extends React.Component<ClusterPrometheusSettingProps> {
+class NonInjectedClusterPrometheusSetting extends React.Component<ClusterPrometheusSettingProps & Dependencies> {
   @observable path = "";
   @observable selectedOption: ProviderValue = autoDetectPrometheus;
   @observable loading = true;
@@ -46,7 +52,7 @@ export class ClusterPrometheusSetting extends React.Component<ClusterPrometheusS
     ];
   }
 
-  constructor(props: ClusterPrometheusSettingProps) {
+  constructor(props: ClusterPrometheusSettingProps & Dependencies) {
     super(props);
     makeObservable(this);
   }
@@ -80,8 +86,7 @@ export class ClusterPrometheusSetting extends React.Component<ClusterPrometheusS
       }),
     );
 
-    metricsApi
-      .getMetricProviders()
+    this.props.requestMetricsProviders()
       .then(values => {
         this.loading = false;
         this.loadedOptions.replace(values.map(provider => [provider.id, provider]));
@@ -155,7 +160,7 @@ export class ClusterPrometheusSetting extends React.Component<ClusterPrometheusS
                 placeholder="<namespace>/<service>:<port>"
               />
               <small className="hint">
-                {`An address to an existing Prometheus installation (<namespace>/<service>:<port>). ${productName} tries to auto-detect address if left empty.`}
+                {`An address to an existing Prometheus installation (<namespace>/<service>:<port>). ${this.props.productName} tries to auto-detect address if left empty.`}
               </small>
             </section>
           </>
@@ -164,3 +169,11 @@ export class ClusterPrometheusSetting extends React.Component<ClusterPrometheusS
     );
   }
 }
+
+export const ClusterPrometheusSetting = withInjectables<Dependencies, ClusterPrometheusSettingProps>(NonInjectedClusterPrometheusSetting, {
+  getProps: (di, props) => ({
+    ...props,
+    productName: di.inject(productNameInjectable),
+    requestMetricsProviders: di.inject(requestMetricsProvidersInjectable),
+  }),
+});
diff --git a/src/renderer/components/command-palette/registered-commands/internal-commands.injectable.tsx b/src/renderer/components/command-palette/registered-commands/internal-commands.injectable.tsx
index 8bf2b196f5..27bbc4aab7 100644
--- a/src/renderer/components/command-palette/registered-commands/internal-commands.injectable.tsx
+++ b/src/renderer/components/command-palette/registered-commands/internal-commands.injectable.tsx
@@ -15,7 +15,6 @@ import { getInjectable } from "@ogre-tools/injectable";
 import commandOverlayInjectable from "../command-overlay.injectable";
 import createTerminalTabInjectable from "../../dock/terminal/create-terminal-tab.injectable";
 import type { DockTabCreate } from "../../dock/dock/store";
-import navigateToPreferencesInjectable from "../../../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable";
 import navigateToHelmChartsInjectable from "../../../../common/front-end-routing/routes/cluster/helm/charts/navigate-to-helm-charts.injectable";
 import navigateToHelmReleasesInjectable from "../../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable";
 import navigateToConfigMapsInjectable from "../../../../common/front-end-routing/routes/cluster/config/config-maps/navigate-to-config-maps.injectable";
@@ -40,6 +39,9 @@ import navigateToCustomResourcesInjectable from "../../../../common/front-end-ro
 import navigateToEntitySettingsInjectable from "../../../../common/front-end-routing/routes/entity-settings/navigate-to-entity-settings.injectable";
 import getEntitySettingCommandsInjectable from "./get-entity-setting-commands.injectable";
 
+// TODO: Importing from features is not OK. Make commands to comply with Open Closed Principle to allow moving implementation under a feature
+import navigateToPreferencesInjectable from "../../../../features/preferences/common/navigate-to-preferences.injectable";
+
 export function isKubernetesClusterActive(context: CommandContext): boolean {
   return context.entity?.kind === "KubernetesCluster";
 }
diff --git a/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx b/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx
deleted file mode 100644
index ad810ef2dd..0000000000
--- a/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx
+++ /dev/null
@@ -1,275 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import "@testing-library/jest-dom/extend-expect";
-import { KubeConfig } from "@kubernetes/client-node";
-import { fireEvent } from "@testing-library/react";
-import type { RenderResult } from "@testing-library/react";
-import * as selectEvent from "react-select-event";
-import type { CreateCluster } from "../../../../common/cluster/create-cluster-injection-token";
-import { createClusterInjectionToken } from "../../../../common/cluster/create-cluster-injection-token";
-import createContextHandlerInjectable from "../../../../main/context-handler/create-context-handler.injectable";
-import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-created.injectable";
-import createKubeconfigManagerInjectable from "../../../../main/kubeconfig-manager/create-kubeconfig-manager.injectable";
-import type { ApplicationBuilder } from "../../test-utils/get-application-builder";
-import { getApplicationBuilder } from "../../test-utils/get-application-builder";
-import normalizedPlatformInjectable from "../../../../common/vars/normalized-platform.injectable";
-import kubectlBinaryNameInjectable from "../../../../main/kubectl/binary-name.injectable";
-import kubectlDownloadingNormalizedArchInjectable from "../../../../main/kubectl/normalized-arch.injectable";
-import type { OpenDeleteClusterDialog } from "../open.injectable";
-import openDeleteClusterDialogInjectable from "../open.injectable";
-
-const currentClusterServerUrl = "https://localhost";
-const nonCurrentClusterServerUrl = "http://localhost";
-const multiClusterConfig = `
-apiVersion: v1
-clusters:
-- cluster:
-    server: ${currentClusterServerUrl}
-  name: some-current-context-cluster
-- cluster:
-    server: ${nonCurrentClusterServerUrl}
-  name: some-non-current-context-cluster
-contexts:
-- context:
-    cluster: some-current-context-cluster
-    user: some-user
-  name: some-current-context
-- context:
-    cluster: some-non-current-context-cluster
-    user: some-user
-  name: some-non-current-context
-current-context: some-current-context
-kind: Config
-preferences: {}
-users:
-- name: some-user
-  user:
-    token: kubeconfig-user-q4lm4:xxxyyyy
-`;
-
-const singleClusterServerUrl = "http://localhost";
-const singleClusterConfig = `
-apiVersion: v1
-clusters:
-- cluster:
-    server: ${singleClusterServerUrl}
-  name: some-cluster
-contexts:
-- context:
-    cluster: some-cluster
-    user: some-user
-  name: some-context
-current-context: some-context
-kind: Config
-preferences: {}
-users:
-- name: some-user
-  user:
-    token: kubeconfig-user-q4lm4:xxxyyyy
-`;
-
-describe("<DeleteClusterDialog />", () => {
-  let builder: ApplicationBuilder;
-
-  beforeEach(() => {
-    builder = getApplicationBuilder();
-
-    builder.beforeApplicationStart((mainDi) => {
-      mainDi.override(createContextHandlerInjectable, () => () => undefined as never);
-      mainDi.override(createKubeconfigManagerInjectable, () => () => undefined as never);
-      mainDi.override(kubectlBinaryNameInjectable, () => "kubectl");
-      mainDi.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64");
-      mainDi.override(normalizedPlatformInjectable, () => "darwin");
-    });
-
-    builder.beforeWindowStart((windowDi) => {
-      windowDi.override(storesAndApisCanBeCreatedInjectable, () => true);
-    });
-  });
-
-  it("shows context switcher when deleting current cluster", async () => {
-    const config = new KubeConfig();
-
-    config.loadFromString(multiClusterConfig);
-
-    const rendered = await builder.render();
-
-    const windowDi = builder.applicationWindow.only.di;
-
-    const createCluster = windowDi.inject(createClusterInjectionToken);
-
-    const cluster = createCluster({
-      id: "some-current-context-cluster",
-      contextName: "some-current-context",
-      preferences: {
-        clusterName: "some-current-context-cluster",
-      },
-      kubeConfigPath: "./temp-kube-config",
-    }, {
-      clusterServerUrl: currentClusterServerUrl,
-    });
-
-    const openDeleteClusterDialog = windowDi.inject(openDeleteClusterDialogInjectable);
-
-    openDeleteClusterDialog({ cluster, config });
-
-    const { getByText } = rendered;
-
-    const menu = getByText("Select new context...");
-
-    expect(menu).toBeInTheDocument();
-    selectEvent.openMenu(menu);
-
-    expect(getByText("some-current-context")).toBeInTheDocument();
-    expect(getByText("some-non-current-context")).toBeInTheDocument();
-  });
-
-  describe("Kubeconfig with different clusters", () => {
-    let rendered: RenderResult;
-    let openDeleteClusterDialog: OpenDeleteClusterDialog;
-    let createCluster: CreateCluster;
-    let config: KubeConfig;
-
-    beforeEach(async () => {
-      config = new KubeConfig();
-
-      config.loadFromString(multiClusterConfig);
-
-      rendered = await builder.render();
-
-      const windowDi = builder.applicationWindow.only.di;
-
-      openDeleteClusterDialog = windowDi.inject(openDeleteClusterDialogInjectable);
-      createCluster = windowDi.inject(createClusterInjectionToken);
-    });
-
-    it("renders w/o errors", () => {
-      expect(rendered.container).toBeInstanceOf(HTMLElement);
-    });
-
-    it("shows warning when deleting non-current-context cluster", () => {
-      const cluster = createCluster({
-        id: "some-non-current-context-cluster",
-        contextName: "some-non-current-context",
-        preferences: {
-          clusterName: "minikube",
-        },
-        kubeConfigPath: "./temp-kube-config",
-      }, {
-        clusterServerUrl: nonCurrentClusterServerUrl,
-      });
-
-      openDeleteClusterDialog({ cluster, config });
-
-      const message = "The contents of kubeconfig file will be changed!";
-
-      expect(rendered.getByText(message)).toBeInstanceOf(HTMLElement);
-    });
-
-    it("shows warning when deleting current-context cluster", () => {
-      const cluster = createCluster({
-        id: "some-current-context-cluster",
-        contextName: "some-current-context",
-        preferences: {
-          clusterName: "some-current-context-cluster",
-        },
-        kubeConfigPath: "./temp-kube-config",
-      }, {
-        clusterServerUrl: currentClusterServerUrl,
-      });
-
-      openDeleteClusterDialog({ cluster, config });
-
-      expect(rendered.getByTestId("current-context-warning")).toBeInstanceOf(HTMLElement);
-    });
-
-    it("shows context switcher after checkbox click", () => {
-      const cluster = createCluster({
-        id: "some-current-context-cluster",
-        contextName: "some-current-context",
-        preferences: {
-          clusterName: "some-current-context-cluster",
-        },
-        kubeConfigPath: "./temp-kube-config",
-      }, {
-        clusterServerUrl: currentClusterServerUrl,
-      });
-
-      openDeleteClusterDialog({ cluster, config });
-
-      const { getByText, getByTestId } = rendered;
-      const link = getByTestId("context-switch");
-
-      expect(link).toBeInstanceOf(HTMLElement);
-      fireEvent.click(link);
-
-      const menu = getByText("Select new context...");
-
-      expect(menu).toBeInTheDocument();
-      selectEvent.openMenu(menu);
-
-      expect(getByText("some-current-context")).toBeInTheDocument();
-      expect(getByText("some-non-current-context")).toBeInTheDocument();
-    });
-
-    it("given cluster in internal kubeconfig, when deleting cluster outside of current context, shows warning for internal kubeconfig cluster", () => {
-      const cluster = createCluster({
-        id: "some-non-current-context-cluster",
-        contextName: "some-non-current-context",
-        preferences: {
-          clusterName: "some-non-current-context-cluster",
-        },
-        kubeConfigPath: "./temp-kube-config",
-      }, {
-        clusterServerUrl: nonCurrentClusterServerUrl,
-      });
-
-      const spy = jest.spyOn(cluster, "isInLocalKubeconfig").mockImplementation(() => true);
-
-      openDeleteClusterDialog({ cluster, config });
-
-      expect(rendered.getByTestId("internal-kubeconfig-warning")).toBeInstanceOf(HTMLElement);
-
-      spy.mockRestore();
-    });
-  });
-
-  describe("Kubeconfig with single cluster", () => {
-    let rendered: RenderResult;
-    let openDeleteClusterDialog: OpenDeleteClusterDialog;
-    let createCluster: CreateCluster;
-    let config: KubeConfig;
-
-    beforeEach(async () => {
-      config = new KubeConfig();
-
-      config.loadFromString(singleClusterConfig);
-
-      rendered = await builder.render();
-
-      const windowDi = builder.applicationWindow.only.di;
-
-      openDeleteClusterDialog = windowDi.inject(openDeleteClusterDialogInjectable);
-      createCluster = windowDi.inject(createClusterInjectionToken);
-    });
-
-    it("shows warning if no other contexts left", () => {
-      const cluster = createCluster({
-        id: "some-cluster",
-        contextName: "some-context",
-        preferences: {
-          clusterName: "some-cluster",
-        },
-        kubeConfigPath: "./temp-kube-config",
-      }, {
-        clusterServerUrl: singleClusterServerUrl,
-      });
-
-      openDeleteClusterDialog({ cluster, config });
-
-      expect(rendered.getByTestId("no-more-contexts-warning")).toBeInstanceOf(HTMLElement);
-    });
-  });
-});
diff --git a/src/renderer/components/delete-cluster-dialog/delete-cluster-dialog-cluster-frame-child-component.injectable.ts b/src/renderer/components/delete-cluster-dialog/delete-cluster-dialog-cluster-frame-child-component.injectable.ts
index ed91967d39..e427768ae9 100644
--- a/src/renderer/components/delete-cluster-dialog/delete-cluster-dialog-cluster-frame-child-component.injectable.ts
+++ b/src/renderer/components/delete-cluster-dialog/delete-cluster-dialog-cluster-frame-child-component.injectable.ts
@@ -17,8 +17,6 @@ const deleteClusterDialogClusterFrameChildComponentInjectable = getInjectable({
   }),
 
   injectionToken: clusterFrameChildComponentInjectionToken,
-
-  causesSideEffects: true,
 });
 
 export default deleteClusterDialogClusterFrameChildComponentInjectable;
diff --git a/src/renderer/components/delete-cluster-dialog/save-config.ts b/src/renderer/components/delete-cluster-dialog/save-config.ts
deleted file mode 100644
index 6037470c60..0000000000
--- a/src/renderer/components/delete-cluster-dialog/save-config.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { KubeConfig } from "@kubernetes/client-node";
-import { dumpYaml } from "@kubernetes/client-node";
-import fs from "fs";
-import * as lockFile from "proper-lockfile";
-
-export async function saveKubeconfig(config: KubeConfig, path: string) {
-  try {
-    const release = await lockFile.lock(path);
-    const contents = dumpYaml(JSON.parse(config.exportConfig()));
-
-    await fs.promises.writeFile(path, contents);
-    await release();
-  } catch (e) {
-    throw new Error(`Failed to acquire lock file.\n${e}`);
-  }
-}
diff --git a/src/renderer/components/delete-cluster-dialog/save-kubeconfig.global-override-for-injectable.ts b/src/renderer/components/delete-cluster-dialog/save-kubeconfig.global-override-for-injectable.ts
new file mode 100644
index 0000000000..6fca6db49b
--- /dev/null
+++ b/src/renderer/components/delete-cluster-dialog/save-kubeconfig.global-override-for-injectable.ts
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../../../common/test-utils/get-global-override";
+import saveKubeconfigInjectable from "./save-kubeconfig.injectable";
+
+export default getGlobalOverride(saveKubeconfigInjectable, () => async () => {
+  throw new Error("tried to save a mondified kubeconfig without override");
+});
diff --git a/src/renderer/components/delete-cluster-dialog/save-kubeconfig.injectable.ts b/src/renderer/components/delete-cluster-dialog/save-kubeconfig.injectable.ts
new file mode 100644
index 0000000000..b264a2fd30
--- /dev/null
+++ b/src/renderer/components/delete-cluster-dialog/save-kubeconfig.injectable.ts
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { KubeConfig } from "@kubernetes/client-node";
+import { dumpYaml } from "@kubernetes/client-node";
+import * as lockFile from "proper-lockfile";
+import { getInjectable } from "@ogre-tools/injectable";
+import writeFileInjectable from "../../../common/fs/write-file.injectable";
+
+export type SaveKubeconfig = (config: KubeConfig, path: string) => Promise<void>;
+
+const saveKubeconfigInjectable = getInjectable({
+  id: "save-kubeconfig",
+  instantiate: (di): SaveKubeconfig => {
+    const writeFile = di.inject(writeFileInjectable);
+
+    return async (config, filePath) => {
+      const release = await lockFile.lock(filePath);
+
+      try {
+        const contents = dumpYaml(JSON.parse(config.exportConfig()));
+
+        await writeFile(filePath, contents);
+      } finally {
+        await release();
+      }
+    };
+  },
+  causesSideEffects: true,
+});
+
+export default saveKubeconfigInjectable;
+
diff --git a/src/renderer/components/delete-cluster-dialog/view.tsx b/src/renderer/components/delete-cluster-dialog/view.tsx
index 3d86bae4a9..69b3bc1612 100644
--- a/src/renderer/components/delete-cluster-dialog/view.tsx
+++ b/src/renderer/components/delete-cluster-dialog/view.tsx
@@ -10,22 +10,34 @@ import { observer } from "mobx-react";
 import React from "react";
 
 import { Button } from "../button";
-import { saveKubeconfig } from "./save-config";
-import { Notifications } from "../notifications";
+import type { ShowNotification } from "../notifications";
 import { Dialog } from "../dialog";
 import { Icon } from "../icon";
 import { Select } from "../select";
 import { Checkbox } from "../checkbox";
-import { requestClearClusterAsDeleting, requestDeleteCluster, requestSetClusterAsDeleting } from "../../ipc";
 import type { HotbarStore } from "../../../common/hotbars/store";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import hotbarStoreInjectable from "../../../common/hotbars/store.injectable";
 import type { DeleteClusterDialogState } from "./state.injectable";
 import deleteClusterDialogStateInjectable from "./state.injectable";
+import type { RequestSetClusterAsDeleting } from "../../../features/cluster/delete-dialog/renderer/request-set-as-deleting.injectable";
+import requestSetClusterAsDeletingInjectable from "../../../features/cluster/delete-dialog/renderer/request-set-as-deleting.injectable";
+import type { RequestClearClusterAsDeleting } from "../../../features/cluster/delete-dialog/renderer/request-clear-as-deleting.injectable";
+import requestClearClusterAsDeletingInjectable from "../../../features/cluster/delete-dialog/renderer/request-clear-as-deleting.injectable";
+import type { RequestDeleteCluster } from "../../../features/cluster/delete-dialog/renderer/request-delete.injectable";
+import requestDeleteClusterInjectable from "../../../features/cluster/delete-dialog/renderer/request-delete.injectable";
+import type { SaveKubeconfig } from "./save-kubeconfig.injectable";
+import saveKubeconfigInjectable from "./save-kubeconfig.injectable";
+import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable";
 
-export interface Dependencies {
+interface Dependencies {
   state: IObservableValue<DeleteClusterDialogState | undefined>;
   hotbarStore: HotbarStore;
+  requestSetClusterAsDeleting: RequestSetClusterAsDeleting;
+  requestDeleteCluster: RequestDeleteCluster;
+  requestClearClusterAsDeleting: RequestClearClusterAsDeleting;
+  showErrorNotification: ShowNotification;
+  saveKubeconfig: SaveKubeconfig;
 }
 
 @observer
@@ -61,18 +73,18 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
   async onDelete(state: DeleteClusterDialogState) {
     const { cluster, config } = state;
 
-    await requestSetClusterAsDeleting(cluster.id);
+    await this.props.requestSetClusterAsDeleting(cluster.id);
     this.removeContext(state);
     this.changeCurrentContext(state);
 
     try {
-      await saveKubeconfig(config, cluster.kubeConfigPath);
+      await this.props.saveKubeconfig(config, cluster.kubeConfigPath);
       this.props.hotbarStore.removeAllHotbarItems(cluster.id);
-      await requestDeleteCluster(cluster.id);
+      await this.props.requestDeleteCluster(cluster.id);
     } catch(error) {
-      Notifications.error(`Cannot remove cluster, failed to process config file. ${error}`);
+      this.props.showErrorNotification(`Cannot remove cluster, failed to process config file. ${error}`);
     } finally {
-      await requestClearClusterAsDeleting(cluster.id);
+      await this.props.requestClearClusterAsDeleting(cluster.id);
     }
 
     this.onClose();
@@ -155,6 +167,14 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
   }
 
   getWarningMessage({ cluster, config }: DeleteClusterDialogState) {
+    if (cluster.isInLocalKubeconfig()) {
+      return (
+        <p data-testid="internal-kubeconfig-warning">
+          Are you sure you want to delete it? It can be re-added through the copy/paste mechanism.
+        </p>
+      );
+    }
+
     const contexts = config.contexts.filter(context => context.name !== cluster.contextName);
 
     if (!contexts.length) {
@@ -173,14 +193,6 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
       );
     }
 
-    if (cluster.isInLocalKubeconfig()) {
-      return (
-        <p data-testid="internal-kubeconfig-warning">
-          Are you sure you want to delete it? It can be re-added through the copy/paste mechanism.
-        </p>
-      );
-    }
-
     return (
       <p data-testid="kubeconfig-change-warning">The contents of kubeconfig file will be changed!</p>
     );
@@ -209,7 +221,7 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
               <hr className={styles.hr} />
               <div className="mt-4">
                 <Checkbox
-                  data-testid="context-switch"
+                  data-testid="delete-cluster-dialog-context-switch"
                   label={(
                     <>
                       <span className="font-semibold">Select current-context</span>
@@ -255,6 +267,7 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
         close={this.close}
         onClose={this.onClose}
         onOpen={state && (() => this.onOpen(state))}
+        data-testid={state ? "delete-cluster-dialog" : undefined}
       >
         {state && this.renderContents(state)}
       </Dialog>
@@ -266,5 +279,10 @@ export const DeleteClusterDialog = withInjectables<Dependencies>(NonInjectedDele
   getProps: (di) => ({
     hotbarStore: di.inject(hotbarStoreInjectable),
     state: di.inject(deleteClusterDialogStateInjectable),
+    requestSetClusterAsDeleting: di.inject(requestSetClusterAsDeletingInjectable),
+    requestClearClusterAsDeleting: di.inject(requestClearClusterAsDeletingInjectable),
+    requestDeleteCluster: di.inject(requestDeleteClusterInjectable),
+    saveKubeconfig: di.inject(saveKubeconfigInjectable),
+    showErrorNotification: di.inject(showErrorNotificationInjectable),
   }),
 });
diff --git a/src/renderer/components/dialog/dialog.tsx b/src/renderer/components/dialog/dialog.tsx
index a8f8c93bdc..0d7bfb24c7 100644
--- a/src/renderer/components/dialog/dialog.tsx
+++ b/src/renderer/components/dialog/dialog.tsx
@@ -146,13 +146,11 @@ class NonInjectedDialog extends React.PureComponent<DialogProps & Dependencies &
   };
 
   render() {
-    const { modal, animated, pinned, "data-testid": testId } = this.props;
-    let { className } = this.props;
+    const { modal, animated, pinned, "data-testid": testId, className } = this.props;
 
-    className = cssNames("Dialog flex center", className, { modal, pinned });
     let dialog = (
       <div
-        className={className}
+        className={cssNames("Dialog flex center", className, { modal, pinned })}
         onClick={stopPropagation}
         ref={this.ref}
         data-testid={testId}
diff --git a/src/renderer/components/dock/create-resource/lens-templates.injectable.ts b/src/renderer/components/dock/create-resource/lens-templates.injectable.ts
index ce78c2286e..86c3e4fd3d 100644
--- a/src/renderer/components/dock/create-resource/lens-templates.injectable.ts
+++ b/src/renderer/components/dock/create-resource/lens-templates.injectable.ts
@@ -3,49 +3,35 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import path from "path";
 import { hasCorrectExtension } from "./has-correct-extension";
 import readFileInjectable from "../../../../common/fs/read-file.injectable";
-import readDirInjectable from "../../../../common/fs/read-dir.injectable";
+import readDirectoryInjectable from "../../../../common/fs/read-directory.injectable";
 import type { RawTemplates } from "./create-resource-templates.injectable";
-import type { GetAbsolutePath } from "../../../../common/path/get-absolute-path.injectable";
-import getAbsolutePathInjectable from "../../../../common/path/get-absolute-path.injectable";
 import staticFilesDirectoryInjectable from "../../../../common/vars/static-files-directory.injectable";
-
-interface Dependencies {
-  readDir: (dirPath: string) => Promise<string[]>;
-  readFile: (filePath: string) => Promise<string>;
-  getAbsolutePath: GetAbsolutePath;
-  staticFilesDirectory: string;
-}
-
-async function getTemplates({ readDir, readFile, getAbsolutePath, staticFilesDirectory }: Dependencies) {
-  const templatesFolder = getAbsolutePath(staticFilesDirectory, "../templates/create-resource");
-
-  /**
-   * Mapping between file names and their contents
-   */
-  const templates: [file: string, contents: string][] = [];
-
-  for (const dirEntry of await readDir(templatesFolder)) {
-    if (hasCorrectExtension(dirEntry)) {
-      templates.push([path.parse(dirEntry).name, await readFile(path.join(templatesFolder, dirEntry))]);
-    }
-  }
-
-  return templates;
-}
+import joinPathsInjectable from "../../../../common/path/join-paths.injectable";
+import parsePathInjectable from "../../../../common/path/parse.injectable";
 
 const lensCreateResourceTemplatesInjectable = getInjectable({
   id: "lens-create-resource-templates",
 
   instantiate: async (di): Promise<RawTemplates> => {
-    const templates = await getTemplates({
-      readFile: di.inject(readFileInjectable),
-      readDir: di.inject(readDirInjectable),
-      getAbsolutePath: di.inject(getAbsolutePathInjectable),
-      staticFilesDirectory: di.inject(staticFilesDirectoryInjectable),
-    });
+    const readFile = di.inject(readFileInjectable);
+    const readDir = di.inject(readDirectoryInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
+    const staticFilesDirectory = di.inject(staticFilesDirectoryInjectable);
+    const parsePath = di.inject(parsePathInjectable);
+
+    /**
+     * Mapping between file names and their contents
+     */
+    const templates: [file: string, contents: string][] = [];
+    const templatesFolder = joinPaths(staticFilesDirectory, "../templates/create-resource");
+
+    for (const dirEntry of await readDir(templatesFolder)) {
+      if (hasCorrectExtension(dirEntry)) {
+        templates.push([parsePath(dirEntry).name, await readFile(joinPaths(templatesFolder, dirEntry))]);
+      }
+    }
 
     return ["lens", templates];
   },
diff --git a/src/renderer/components/dock/create-resource/user-templates.injectable.ts b/src/renderer/components/dock/create-resource/user-templates.injectable.ts
index 524dad3d86..65b896f95d 100644
--- a/src/renderer/components/dock/create-resource/user-templates.injectable.ts
+++ b/src/renderer/components/dock/create-resource/user-templates.injectable.ts
@@ -3,101 +3,108 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type { IComputedValue } from "mobx";
 import { computed, observable } from "mobx";
-import path from "path";
-import os from "os";
 import { delay, getOrInsert, isErrnoException, waitForPath } from "../../../utils";
-import { watch } from "chokidar";
 import { readFile } from "fs/promises";
-import logger from "../../../../common/logger";
 import { hasCorrectExtension } from "./has-correct-extension";
 import type { RawTemplates } from "./create-resource-templates.injectable";
-
-const userTemplatesFolder = path.join(os.homedir(), ".k8slens", "templates");
-
-function groupTemplates(templates: Map<string, string>): RawTemplates[] {
-  const res = new Map<string, [string, string][]>();
-
-  for (const [filePath, contents] of templates) {
-    const rawRelative = path.dirname(path.relative(userTemplatesFolder, filePath));
-    const title = rawRelative === "."
-      ? "ungrouped"
-      : rawRelative;
-
-    getOrInsert(res, title, []).push([path.parse(filePath).name, contents]);
-  }
-
-  return [...res.entries()];
-}
-
-function watchUserCreateResourceTemplates(): IComputedValue<RawTemplates[]> {
-  /**
-   * Map between filePaths and template contents
-   */
-  const templates = observable.map<string, string>();
-
-  const onAddOrChange = async (filePath: string) => {
-    if (!hasCorrectExtension(filePath)) {
-      // ignore non yaml or json files
-      return;
-    }
-
-    try {
-      const contents = await readFile(filePath, "utf-8");
-
-      templates.set(filePath, contents);
-    } catch (error) {
-      if (isErrnoException(error) && error.code === "ENOENT") {
-        // ignore, file disappeared
-      } else {
-        logger.warn(`[USER-CREATE-RESOURCE-TEMPLATES]: encountered error while reading ${filePath}`, error);
-      }
-    }
-  };
-  const onUnlink = (filePath: string) => {
-    templates.delete(filePath);
-  };
-
-  (async () => {
-    for (let i = 1;; i *= 2) {
-      try {
-        await waitForPath(userTemplatesFolder);
-        break;
-      } catch (error) {
-        logger.warn(`[USER-CREATE-RESOURCE-TEMPLATES]: encountered error while waiting for ${userTemplatesFolder} to exist, waiting and trying again`, error);
-        await delay(i * 1000); // exponential backoff in seconds
-      }
-    }
-
-    /**
-     * NOTE: There is technically a race condition here of the form "time-of-check to time-of-use"
-     */
-    watch(userTemplatesFolder, {
-      disableGlobbing: true,
-      ignorePermissionErrors: true,
-      usePolling: false,
-      awaitWriteFinish: {
-        pollInterval: 100,
-        stabilityThreshold: 1000,
-      },
-      ignoreInitial: false,
-      atomic: 150, // for "atomic writes"
-    })
-      .on("add", onAddOrChange)
-      .on("change", onAddOrChange)
-      .on("unlink", onUnlink)
-      .on("error", error => {
-        logger.warn(`[USER-CREATE-RESOURCE-TEMPLATES]: encountered error while watching files under ${userTemplatesFolder}`, error);
-      });
-  })();
-
-  return computed(() => groupTemplates(templates));
-}
+import joinPathsInjectable from "../../../../common/path/join-paths.injectable";
+import watchInjectable from "../../../../common/fs/watch/watch.injectable";
+import getRelativePathInjectable from "../../../../common/path/get-relative-path.injectable";
+import homeDirectoryPathInjectable from "../../../../common/os/home-directory-path.injectable";
+import getDirnameOfPathInjectable from "../../../../common/path/get-dirname.injectable";
+import loggerInjectable from "../../../../common/logger.injectable";
+import parsePathInjectable from "../../../../common/path/parse.injectable";
 
 const userCreateResourceTemplatesInjectable = getInjectable({
   id: "user-create-resource-templates",
-  instantiate: () => watchUserCreateResourceTemplates(),
+  instantiate: (di) => {
+    const joinPaths = di.inject(joinPathsInjectable);
+    const watch = di.inject(watchInjectable);
+    const getRelativePath = di.inject(getRelativePathInjectable);
+    const homeDirectoryPath = di.inject(homeDirectoryPathInjectable);
+    const getDirnameOfPath = di.inject(getDirnameOfPathInjectable);
+    const logger = di.inject(loggerInjectable);
+    const parsePath = di.inject(parsePathInjectable);
+
+    const userTemplatesFolder = joinPaths(homeDirectoryPath, ".k8slens", "templates");
+    const groupTemplates = (templates: Map<string, string>): RawTemplates[] => {
+      const res = new Map<string, [string, string][]>();
+
+      for (const [filePath, contents] of templates) {
+        const rawRelative = getDirnameOfPath(getRelativePath(userTemplatesFolder, filePath));
+        const title = rawRelative === "."
+          ? "ungrouped"
+          : rawRelative;
+
+        getOrInsert(res, title, []).push([parsePath(filePath).name, contents]);
+      }
+
+      return [...res.entries()];
+    };
+
+    /**
+     * Map between filePaths and template contents
+     */
+    const templates = observable.map<string, string>();
+
+    const onAddOrChange = async (filePath: string) => {
+      if (!hasCorrectExtension(filePath)) {
+      // ignore non yaml or json files
+        return;
+      }
+
+      try {
+        const contents = await readFile(filePath, "utf-8");
+
+        templates.set(filePath, contents);
+      } catch (error) {
+        if (isErrnoException(error) && error.code === "ENOENT") {
+        // ignore, file disappeared
+        } else {
+          logger.warn(`[USER-CREATE-RESOURCE-TEMPLATES]: encountered error while reading ${filePath}`, error);
+        }
+      }
+    };
+    const onUnlink = (filePath: string) => {
+      templates.delete(filePath);
+    };
+
+    (async () => {
+      for (let i = 1;; i *= 2) {
+        try {
+          await waitForPath(userTemplatesFolder);
+          break;
+        } catch (error) {
+          logger.warn(`[USER-CREATE-RESOURCE-TEMPLATES]: encountered error while waiting for ${userTemplatesFolder} to exist, waiting and trying again`, error);
+          await delay(i * 1000); // exponential backoff in seconds
+        }
+      }
+
+      /**
+     * NOTE: There is technically a race condition here of the form "time-of-check to time-of-use"
+     */
+      watch(userTemplatesFolder, {
+        disableGlobbing: true,
+        ignorePermissionErrors: true,
+        usePolling: false,
+        awaitWriteFinish: {
+          pollInterval: 100,
+          stabilityThreshold: 1000,
+        },
+        ignoreInitial: false,
+        atomic: 150, // for "atomic writes"
+      })
+        .on("add", onAddOrChange)
+        .on("change", onAddOrChange)
+        .on("unlink", onUnlink)
+        .on("error", error => {
+          logger.warn(`[USER-CREATE-RESOURCE-TEMPLATES]: encountered error while watching files under ${userTemplatesFolder}`, error);
+        });
+    })();
+
+    return computed(() => groupTemplates(templates));
+  },
 });
 
 export default userCreateResourceTemplatesInjectable;
diff --git a/src/renderer/components/dock/create-resource/view.tsx b/src/renderer/components/dock/create-resource/view.tsx
index a9245e4494..d84a823259 100644
--- a/src/renderer/components/dock/create-resource/view.tsx
+++ b/src/renderer/components/dock/create-resource/view.tsx
@@ -6,14 +6,13 @@
 import React from "react";
 import type { SelectOption } from "../../select";
 import { Select } from "../../select";
-import yaml from "js-yaml";
+import yaml, { dump } from "js-yaml";
 import type { IComputedValue } from "mobx";
 import { makeObservable, observable } from "mobx";
 import { observer } from "mobx-react";
 import type { CreateResourceTabStore } from "./store";
 import { EditorPanel } from "../editor-panel";
 import { InfoPanel } from "../info-panel";
-import * as resourceApplierApi from "../../../../common/k8s-api/endpoints/resource-applier.api";
 import { Notifications } from "../../notifications";
 import logger from "../../../../common/logger";
 import type { ApiManager } from "../../../../common/k8s-api/api-manager";
@@ -28,6 +27,8 @@ import type { GetDetailsUrl } from "../../kube-detail-params/get-details-url.inj
 import apiManagerInjectable from "../../../../common/k8s-api/api-manager/manager.injectable";
 import getDetailsUrlInjectable from "../../kube-detail-params/get-details-url.injectable";
 import navigateInjectable from "../../../navigation/navigate.injectable";
+import type { RequestKubeObjectCreation } from "../../../../common/k8s-api/endpoints/resource-applier.api/request-update.injectable";
+import requestKubeObjectCreationInjectable from "../../../../common/k8s-api/endpoints/resource-applier.api/request-update.injectable";
 
 export interface CreateResourceProps {
   tabId: string;
@@ -39,6 +40,7 @@ interface Dependencies {
   apiManager: ApiManager;
   navigate: Navigate;
   getDetailsUrl: GetDetailsUrl;
+  requestKubeObjectCreation: RequestKubeObjectCreation;
 }
 
 @observer
@@ -68,7 +70,7 @@ class NonInjectedCreateResource extends React.Component<CreateResourceProps & De
   };
 
   create = async (): Promise<void> => {
-    const { apiManager, getDetailsUrl, navigate } = this.props;
+    const { apiManager, getDetailsUrl, navigate, requestKubeObjectCreation } = this.props;
 
     if (this.error || !this.data?.trim()) {
       // do not save when field is empty or there is an error
@@ -84,7 +86,7 @@ class NonInjectedCreateResource extends React.Component<CreateResourceProps & De
 
     const creatingResources = resources.map(async (resource) => {
       try {
-        const data = await resourceApplierApi.update(resource);
+        const data = await requestKubeObjectCreation(dump(resource));
         const { kind, apiVersion, metadata: { name, namespace }} = data;
 
         const showDetails = () => {
@@ -168,5 +170,6 @@ export const CreateResource = withInjectables<Dependencies, CreateResourceProps>
     apiManager: di.inject(apiManagerInjectable),
     getDetailsUrl: di.inject(getDetailsUrlInjectable),
     navigate: di.inject(navigateInjectable),
+    requestKubeObjectCreation: di.inject(requestKubeObjectCreationInjectable),
   }),
 });
diff --git a/src/renderer/components/dock/dock-tab.tsx b/src/renderer/components/dock/dock-tab.tsx
index df578675fd..5a672e2fb3 100644
--- a/src/renderer/components/dock/dock-tab.tsx
+++ b/src/renderer/components/dock/dock-tab.tsx
@@ -103,6 +103,7 @@ class NonInjectedDockTab extends React.Component<DockTabProps & Dependencies> {
                     material="close"
                     tooltip={`Close ${this.props.isMac ? "⌘+W" : "Ctrl+W"}`}
                     onClick={close}
+                    data-testid={`dock-tab-close-for-${id}`}
                   />
                 </div>
               )}
diff --git a/src/renderer/components/dock/install-chart/chart-data/call-for-helm-chart-values.injectable.ts b/src/renderer/components/dock/install-chart/chart-data/call-for-helm-chart-values.injectable.ts
deleted file mode 100644
index 1c379b56e5..0000000000
--- a/src/renderer/components/dock/install-chart/chart-data/call-for-helm-chart-values.injectable.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { getChartValues } from "../../../../../common/k8s-api/endpoints/helm-charts.api";
-
-export type CallForHelmChartValues = (
-  repo: string,
-  name: string,
-  version: string
-) => Promise<string>;
-
-const callForHelmChartValuesInjectable = getInjectable({
-  id: "call-for-helm-chart-values",
-  instantiate: (): CallForHelmChartValues => getChartValues,
-  causesSideEffects: true,
-});
-
-export default callForHelmChartValuesInjectable;
diff --git a/src/renderer/components/dock/install-chart/install-chart-model.injectable.tsx b/src/renderer/components/dock/install-chart/install-chart-model.injectable.tsx
index 64f2e27e12..0db94fbd59 100644
--- a/src/renderer/components/dock/install-chart/install-chart-model.injectable.tsx
+++ b/src/renderer/components/dock/install-chart/install-chart-model.injectable.tsx
@@ -5,36 +5,31 @@
 import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
 import installChartTabStoreInjectable from "./store.injectable";
 import { waitUntilDefined } from "../../../../common/utils";
-import type { CallForHelmChartValues } from "./chart-data/call-for-helm-chart-values.injectable";
-import callForHelmChartValuesInjectable from "./chart-data/call-for-helm-chart-values.injectable";
 import type { IChartInstallData, InstallChartTabStore } from "./store";
 import type { HelmChart } from "../../../../common/k8s-api/endpoints/helm-charts.api";
 import React from "react";
-import {
-  action,
-  computed,
-  observable,
-  runInAction,
-} from "mobx";
+import { action, computed, observable, runInAction } from "mobx";
 import assert from "assert";
-import type { CallForCreateHelmRelease } from "../../+helm-releases/create-release/call-for-create-helm-release.injectable";
-import callForCreateHelmReleaseInjectable from "../../+helm-releases/create-release/call-for-create-helm-release.injectable";
+import type { RequestCreateHelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable";
+import requestCreateHelmReleaseInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable";
 import type { HelmReleaseUpdateDetails } from "../../../../common/k8s-api/endpoints/helm-releases.api";
 import dockStoreInjectable from "../dock/store.injectable";
 import type { NavigateToHelmReleases } from "../../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable";
 import navigateToHelmReleasesInjectable from "../../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable";
 import type { SingleValue } from "react-select";
-import type { CallForHelmChartVersions } from "../../+helm-charts/details/versions/call-for-helm-chart-versions.injectable";
-import callForHelmChartVersionsInjectable from "../../+helm-charts/details/versions/call-for-helm-chart-versions.injectable";
+import type { RequestHelmChartValues } from "../../../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable";
+import requestHelmChartValuesInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable";
+import type { RequestHelmChartVersions } from "../../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable";
+import requestHelmChartVersionsInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable";
 
 const installChartModelInjectable = getInjectable({
   id: "install-chart-model",
 
   instantiate: async (di, tabId: string) => {
     const store = di.inject(installChartTabStoreInjectable);
-    const callForHelmChartValues = di.inject(callForHelmChartValuesInjectable);
-    const callForHelmChartVersions = di.inject(callForHelmChartVersionsInjectable);
-    const callForCreateHelmRelease = di.inject(callForCreateHelmReleaseInjectable);
+    const requestHelmChartValues = di.inject(requestHelmChartValuesInjectable);
+    const requestHelmChartVersions = di.inject(requestHelmChartVersionsInjectable);
+    const callForCreateHelmRelease = di.inject(requestCreateHelmReleaseInjectable);
     const dockStore = di.inject(dockStoreInjectable);
     const navigateToHelmReleases = di.inject(navigateToHelmReleasesInjectable);
     const closeTab = () => dockStore.closeTab(tabId);
@@ -49,8 +44,8 @@ const installChartModelInjectable = getInjectable({
       callForCreateHelmRelease,
       closeTab,
       navigateToHelmReleases,
-      callForHelmChartValues,
-      callForHelmChartVersions,
+      requestHelmChartValues,
+      requestHelmChartVersions,
       store,
     });
 
@@ -71,9 +66,9 @@ interface Dependencies {
   closeTab: () => void;
   navigateToHelmReleases: NavigateToHelmReleases;
   waitForChart: () => Promise<void>;
-  callForCreateHelmRelease: CallForCreateHelmRelease;
-  callForHelmChartValues: CallForHelmChartValues;
-  callForHelmChartVersions: CallForHelmChartVersions;
+  callForCreateHelmRelease: RequestCreateHelmRelease;
+  requestHelmChartValues: RequestHelmChartValues;
+  requestHelmChartVersions: RequestHelmChartVersions;
   store: InstallChartTabStore;
 }
 
@@ -127,7 +122,7 @@ export class InstallChartModel {
         this.configuration.isLoading.set(true);
       });
 
-      const configuration = await this.dependencies.callForHelmChartValues(
+      const configuration = await this.dependencies.requestHelmChartValues(
         this.chart.repo,
         this.chart.name,
         version,
@@ -193,13 +188,13 @@ export class InstallChartModel {
     await this.dependencies.waitForChart();
 
     const [defaultConfiguration, versions] = await Promise.all([
-      this.dependencies.callForHelmChartValues(
+      this.dependencies.requestHelmChartValues(
         this.chart.repo,
         this.chart.name,
         this.chart.version,
       ),
 
-      this.dependencies.callForHelmChartVersions(
+      this.dependencies.requestHelmChartVersions(
         this.chart.repo,
         this.chart.name,
       ),
diff --git a/src/renderer/components/dock/logs/__test__/to-bottom.test.tsx b/src/renderer/components/dock/logs/__test__/to-bottom.test.tsx
index 2040dada89..9e4177c1dd 100644
--- a/src/renderer/components/dock/logs/__test__/to-bottom.test.tsx
+++ b/src/renderer/components/dock/logs/__test__/to-bottom.test.tsx
@@ -4,11 +4,22 @@
  */
 import React from "react";
 import "@testing-library/jest-dom/extend-expect";
-import { fireEvent, render } from "@testing-library/react";
+import { fireEvent } from "@testing-library/react";
 import { ToBottom } from "../to-bottom";
 import { noop } from "../../../../utils";
+import type { DiRender } from "../../../test-utils/renderFor";
+import { renderFor } from "../../../test-utils/renderFor";
+import { getDiForUnitTesting } from "../../../../getDiForUnitTesting";
 
 describe("<ToBottom/>", () => {
+  let render: DiRender;
+
+  beforeEach(() => {
+    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    render = renderFor(di);
+  });
+
   it("renders w/o errors", () => {
     const { container } = render(<ToBottom onClick={noop}/>);
 
diff --git a/src/renderer/components/dock/logs/controls.tsx b/src/renderer/components/dock/logs/controls.tsx
index 6c3da627cb..2e885b0ce2 100644
--- a/src/renderer/components/dock/logs/controls.tsx
+++ b/src/renderer/components/dock/logs/controls.tsx
@@ -73,6 +73,7 @@ export const LogControls = observer(({ model }: LogControlsProps) => {
         />
 
         <DownloadLogsDropdown
+          disabled={logs.length === 0}
           downloadVisibleLogs={model.downloadLogs}
           downloadAllLogs={model.downloadAllLogs}
         />
diff --git a/src/renderer/components/dock/logs/download-all-logs.injectable.ts b/src/renderer/components/dock/logs/download-all-logs.injectable.ts
index abe87cc352..089652af0e 100644
--- a/src/renderer/components/dock/logs/download-all-logs.injectable.ts
+++ b/src/renderer/components/dock/logs/download-all-logs.injectable.ts
@@ -7,6 +7,7 @@ import type { PodLogsQuery } from "../../../../common/k8s-api/endpoints";
 import type { ResourceDescriptor } from "../../../../common/k8s-api/kube-api";
 import loggerInjectable from "../../../../common/logger.injectable";
 import openSaveFileDialogInjectable from "../../../utils/save-file.injectable";
+import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable";
 import callForLogsInjectable from "./call-for-logs.injectable";
 
 const downloadAllLogsInjectable = getInjectable({
@@ -16,7 +17,8 @@ const downloadAllLogsInjectable = getInjectable({
     const callForLogs = di.inject(callForLogsInjectable);
     const openSaveFileDialog = di.inject(openSaveFileDialogInjectable);
     const logger = di.inject(loggerInjectable);
-
+    const showErrorNotification = di.inject(showErrorNotificationInjectable);
+    
     return async (params: ResourceDescriptor, query: PodLogsQuery) => {
       const logs = await callForLogs(params, query).catch(error => {
         logger.error("Can't download logs: ", error);
@@ -24,6 +26,8 @@ const downloadAllLogsInjectable = getInjectable({
 
       if (logs) {
         openSaveFileDialog(`${params.name}.log`, logs, "text/plain");
+      } else {
+        showErrorNotification("No logs to download");
       }
     };
   },
diff --git a/src/renderer/components/dock/logs/download-logs-dropdown.tsx b/src/renderer/components/dock/logs/download-logs-dropdown.tsx
index 1da7b9f8a6..d2082927fb 100644
--- a/src/renderer/components/dock/logs/download-logs-dropdown.tsx
+++ b/src/renderer/components/dock/logs/download-logs-dropdown.tsx
@@ -13,9 +13,10 @@ import { Dropdown } from "../../dropdown/dropdown";
 interface DownloadLogsDropdownProps {
   downloadVisibleLogs: () => void;
   downloadAllLogs: () => Promise<void> | undefined;
+  disabled?: boolean;
 }
 
-export function DownloadLogsDropdown({ downloadAllLogs, downloadVisibleLogs }: DownloadLogsDropdownProps) {
+export function DownloadLogsDropdown({ downloadAllLogs, downloadVisibleLogs, disabled }: DownloadLogsDropdownProps) {
   const [waiting, setWaiting] = useState(false);
 
   const downloadAll = async () => {
@@ -35,7 +36,7 @@ export function DownloadLogsDropdown({ downloadAllLogs, downloadVisibleLogs }: D
         <button
           data-testid="download-logs-dropdown"
           className={styles.dropdown}
-          disabled={waiting}
+          disabled={waiting || disabled}
         >
           Download
           <Icon material="arrow_drop_down" smallest/>
diff --git a/src/renderer/components/dock/logs/store.ts b/src/renderer/components/dock/logs/store.ts
index 53f6f03196..58462f41db 100644
--- a/src/renderer/components/dock/logs/store.ts
+++ b/src/renderer/components/dock/logs/store.ts
@@ -193,8 +193,8 @@ export class LogStore {
    */
   getLastSinceTime(tabId: TabId): string {
     const logs = this.podLogs.get(tabId) ?? [];
-    const timestamps = this.getTimestamps(logs[logs.length - 1]);
-    const stamp = timestamps[0] ? new Date(timestamps[0]) : new Date();
+    const [timestamp] = this.getTimestamps(logs[logs.length - 1]) ?? [];
+    const stamp = timestamp ? new Date(timestamp) : new Date();
 
     stamp.setSeconds(stamp.getSeconds() + 1); // avoid duplicates from last second
 
@@ -211,8 +211,8 @@ export class LogStore {
     return [extraction[1], extraction[2]];
   }
 
-  getTimestamps(logs: string): RegExpMatchArray {
-    return logs.match(/^\d+\S+/gm) ?? [];
+  getTimestamps(logs: string) {
+    return logs.match(/^\d+\S+/gm);
   }
 
   removeTimestamps(logs: string): string {
diff --git a/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.injectable.ts b/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.injectable.ts
index 3233d08cb5..7bf390da02 100644
--- a/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.injectable.ts
+++ b/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.injectable.ts
@@ -3,23 +3,27 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
+import type { IChartUpgradeData } from "./store.injectable";
 import upgradeChartTabStoreInjectable from "./store.injectable";
 import dockStoreInjectable from "../dock/store.injectable";
 import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api";
 import type { DockStore, DockTabCreateSpecific, TabId } from "../dock/store";
 import { TabKind } from "../dock/store";
-import type { UpgradeChartTabStore } from "./store";
 import { runInAction } from "mobx";
 import getRandomUpgradeChartTabIdInjectable from "./get-random-upgrade-chart-tab-id.injectable";
+import type { DockTabStore } from "../dock-tab-store/dock-tab.store";
 
 interface Dependencies {
-  upgradeChartStore: UpgradeChartTabStore;
+  upgradeChartStore: DockTabStore<IChartUpgradeData>;
   dockStore: DockStore;
   getRandomId: () => string;
 }
 
 const createUpgradeChartTab = ({ upgradeChartStore, dockStore, getRandomId }: Dependencies) => (release: HelmRelease, tabParams: DockTabCreateSpecific = {}): TabId => {
-  const tabId = upgradeChartStore.getTabIdByRelease(release.getName());
+  const tabId = upgradeChartStore.findTabIdFromData(val => (
+    val.releaseName === release.getName()
+    && val.releaseNamespace === release.getNs()
+  ));
 
   if (tabId) {
     dockStore.open();
diff --git a/src/renderer/components/dock/upgrade-chart/store.injectable.ts b/src/renderer/components/dock/upgrade-chart/store.injectable.ts
index 29a53c41d3..8884f5935c 100644
--- a/src/renderer/components/dock/upgrade-chart/store.injectable.ts
+++ b/src/renderer/components/dock/upgrade-chart/store.injectable.ts
@@ -3,9 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { UpgradeChartTabStore } from "./store";
 import createDockTabStoreInjectable from "../dock-tab-store/create-dock-tab-store.injectable";
-import createStorageInjectable from "../../../utils/create-storage/create-storage.injectable";
+
+export interface IChartUpgradeData {
+  releaseName: string;
+  releaseNamespace: string;
+}
 
 const upgradeChartTabStoreInjectable = getInjectable({
   id: "upgrade-chart-tab-store",
@@ -13,9 +16,8 @@ const upgradeChartTabStoreInjectable = getInjectable({
   instantiate: (di) => {
     const createDockTabStore = di.inject(createDockTabStoreInjectable);
 
-    return new UpgradeChartTabStore({
-      createStorage: di.inject(createStorageInjectable),
-      valuesStore: createDockTabStore<string>(),
+    return createDockTabStore<IChartUpgradeData>({
+      storageKey: "chart_releases",
     });
   },
 });
diff --git a/src/renderer/components/dock/upgrade-chart/store.ts b/src/renderer/components/dock/upgrade-chart/store.ts
deleted file mode 100644
index 3e699c01b1..0000000000
--- a/src/renderer/components/dock/upgrade-chart/store.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { action, computed, makeObservable } from "mobx";
-import type { TabId } from "../dock/store";
-import type { DockTabStoreDependencies } from "../dock-tab-store/dock-tab.store";
-import { DockTabStore } from "../dock-tab-store/dock-tab.store";
-import { getReleaseValues } from "../../../../common/k8s-api/endpoints/helm-releases.api";
-import assert from "assert";
-
-export interface IChartUpgradeData {
-  releaseName: string;
-  releaseNamespace: string;
-}
-
-export interface UpgradeChartTabStoreDependencies extends DockTabStoreDependencies {
-  valuesStore: DockTabStore<string>;
-}
-
-export class UpgradeChartTabStore extends DockTabStore<IChartUpgradeData> {
-  @computed private get releaseNameReverseLookup(): Map<string, string> {
-    return new Map(this.getAllData().map(([id, { releaseName }]) => [releaseName, id]));
-  }
-
-  get values() {
-    return this.dependencies.valuesStore;
-  }
-
-  constructor(protected readonly dependencies: UpgradeChartTabStoreDependencies) {
-    super(dependencies, {
-      storageKey: "chart_releases",
-    });
-
-    makeObservable(this);
-  }
-
-  @action
-  async reloadValues(tabId: TabId) {
-    this.values.clearData(tabId); // reset
-    const data =  this.getData(tabId);
-
-    assert(data, "cannot reload values if no data");
-
-    const { releaseName, releaseNamespace } = data;
-    const values = await getReleaseValues(releaseName, releaseNamespace, true);
-
-    this.values.setData(tabId, values);
-  }
-
-  getTabIdByRelease(releaseName: string) {
-    return this.releaseNameReverseLookup.get(releaseName);
-  }
-}
diff --git a/src/renderer/components/dock/upgrade-chart/tab-data.injectable.ts b/src/renderer/components/dock/upgrade-chart/tab-data.injectable.ts
new file mode 100644
index 0000000000..0189ecf6a7
--- /dev/null
+++ b/src/renderer/components/dock/upgrade-chart/tab-data.injectable.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { waitUntilDefined } from "../../../utils";
+import upgradeChartTabStoreInjectable from "./store.injectable";
+
+const upgradeChartTabDataInjectable = getInjectable({
+  id: "upgrade-chart-tab-data",
+  instantiate: (di, tabId) => {
+    const upgradeChartTabStore = di.inject(upgradeChartTabStoreInjectable);
+
+    return waitUntilDefined(() => upgradeChartTabStore.getData(tabId));
+  },
+  lifecycle: lifecycleEnum.keyedSingleton({
+    getInstanceKey: (di, tabId: string) => tabId,
+  }),
+});
+
+export default upgradeChartTabDataInjectable;
diff --git a/src/renderer/components/dock/upgrade-chart/upgrade-chart-model.injectable.ts b/src/renderer/components/dock/upgrade-chart/upgrade-chart-model.injectable.ts
new file mode 100644
index 0000000000..bf3d9a0214
--- /dev/null
+++ b/src/renderer/components/dock/upgrade-chart/upgrade-chart-model.injectable.ts
@@ -0,0 +1,149 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { asyncComputed } from "@ogre-tools/injectable-react";
+import type { IComputedValue } from "mobx";
+import { action, computed, observable, when } from "mobx";
+import type { SingleValue } from "react-select";
+import type { HelmChartVersion } from "../../+helm-charts/helm-charts/versions";
+import helmChartVersionsInjectable from "../../+helm-charts/helm-charts/versions.injectable";
+import releasesInjectable from "../../+helm-releases/releases.injectable";
+import updateReleaseInjectable from "../../+helm-releases/update-release/update-release.injectable";
+import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api";
+import requestHelmReleaseConfigurationInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable";
+import type { AsyncResult } from "../../../../common/utils/async-result";
+import { waitUntilDefined } from "../../../utils";
+import type { SelectOption } from "../../select";
+import type { DockTab } from "../dock/store";
+import upgradeChartTabDataInjectable from "./tab-data.injectable";
+
+export interface UpgradeChartModel {
+  readonly release: HelmRelease;
+  readonly versionOptions: IComputedValue<SelectOption<HelmChartVersion>[]>;
+  readonly configration: {
+    readonly value: IComputedValue<string>;
+    set: (value: string) => void;
+    readonly error: IComputedValue<string | undefined>;
+    setError: (error: unknown) => void;
+  };
+  readonly version: {
+    readonly value: IComputedValue<HelmChartVersion | undefined>;
+    set: (value: SingleValue<SelectOption<HelmChartVersion>>) => void;
+  };
+  submit: () => Promise<AsyncResult<void, string>>;
+}
+
+const upgradeChartModelInjectable = getInjectable({
+  id: "upgrade-chart-model",
+  instantiate: async (di, tab): Promise<UpgradeChartModel> => {
+    const releases = di.inject(releasesInjectable);
+    const requestHelmReleaseConfiguration = di.inject(requestHelmReleaseConfigurationInjectable);
+    const updateRelease = di.inject(updateReleaseInjectable);
+    const tabData = await di.inject(upgradeChartTabDataInjectable, tab.id);
+
+    const release = await waitUntilDefined(() => (
+      releases.value
+        .get()
+        .find(release => (
+          release.getName() === tabData.releaseName
+          && release.getNs() === tabData.releaseNamespace
+        ))
+    ));
+
+    const versions = di.inject(helmChartVersionsInjectable, release);
+
+    const storedConfiguration = asyncComputed({
+      getValueFromObservedPromise: () =>
+        requestHelmReleaseConfiguration(
+          release.getName(),
+          release.getNs(),
+          true,
+        ),
+
+      valueWhenPending: "",
+    });
+
+    await when(() => !versions.pending.get());
+
+    const configrationValue = observable.box<string>();
+    const configrationEditError = observable.box<string>();
+    const configration: UpgradeChartModel["configration"] = {
+      value: computed(() => configrationValue.get() ?? storedConfiguration.value.get()),
+      set: action((value) => {
+        configrationValue.set(value);
+        configrationEditError.set(undefined);
+      }),
+      error: computed(() => configrationEditError.get()),
+      setError: action((error) => configrationEditError.set(String(error))),
+    };
+    const versionValue = observable.box<HelmChartVersion>(undefined, {
+      deep: false,
+    });
+    const version: UpgradeChartModel["version"] = {
+      value: computed(() => versionValue.get() ?? versions.value.get()[0]),
+      set: action((option) => versionValue.set(option?.value)),
+    };
+    const versionOptions = computed(() => (
+      versions.value
+        .get()
+        .map(version => ({
+          value: version,
+          label: `${version.repo}/${release.getChart()}-${version.version}`,
+        }))
+    ));
+
+    return {
+      release,
+      versionOptions,
+      configration,
+      version,
+      submit: async () => {
+        const selectedVersion = version.value.get();
+
+        if (!selectedVersion) {
+          return {
+            callWasSuccessful: false,
+            error: "No selected version",
+          };
+        }
+
+        const editError = configrationEditError.get();
+
+        if (editError) {
+          return {
+            callWasSuccessful: false,
+            error: editError,
+          };
+        }
+
+        const result = await updateRelease(
+          release.getName(),
+          release.getNs(),
+          {
+            chart: release.getChart(),
+            values: configration.value.get(),
+            ...selectedVersion,
+          },
+        );
+
+        if (result.callWasSuccessful === true) {
+          storedConfiguration.invalidate();
+
+          return { callWasSuccessful: true };
+        }
+
+        return {
+          callWasSuccessful: false,
+          error: String(result.error),
+        };
+      },
+    };
+  },
+  lifecycle: lifecycleEnum.keyedSingleton({
+    getInstanceKey: (di, tab: DockTab) => tab.id,
+  }),
+});
+
+export default upgradeChartModelInjectable;
diff --git a/src/renderer/components/dock/upgrade-chart/view.tsx b/src/renderer/components/dock/upgrade-chart/view.tsx
index 11d60b6c87..b25f3f24fc 100644
--- a/src/renderer/components/dock/upgrade-chart/view.tsx
+++ b/src/renderer/components/dock/upgrade-chart/view.tsx
@@ -6,26 +6,19 @@
 import "./upgrade-chart.scss";
 
 import React from "react";
-import { action, makeObservable, observable, reaction } from "mobx";
-import { disposeOnUnmount, observer } from "mobx-react";
+import { observer } from "mobx-react";
 import { cssNames } from "../../../utils";
 import type { DockTab } from "../dock/store";
 import { InfoPanel } from "../info-panel";
-import type { UpgradeChartTabStore } from "./store";
 import { Spinner } from "../../spinner";
 import { Badge } from "../../badge";
 import { EditorPanel } from "../editor-panel";
-import { helmChartStore, type ChartVersion } from "../../+helm-charts/helm-chart.store";
-import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api";
 import type { SelectOption } from "../../select";
 import { Select } from "../../select";
-import type { IAsyncComputed } from "@ogre-tools/injectable-react";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import upgradeChartTabStoreInjectable from "./store.injectable";
-import updateReleaseInjectable from "../../+helm-releases/update-release/update-release.injectable";
-import releasesInjectable from "../../+helm-releases/releases.injectable";
-import type { CallForHelmReleaseUpdate } from "../../+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.injectable";
-import { first } from "lodash/fp";
+import type { UpgradeChartModel } from "./upgrade-chart-model.injectable";
+import upgradeChartModelInjectable from "./upgrade-chart-model.injectable";
+import type { HelmChartVersion } from "../../+helm-charts/helm-charts/versions";
 
 export interface UpgradeChartProps {
   className?: string;
@@ -33,159 +26,74 @@ export interface UpgradeChartProps {
 }
 
 interface Dependencies {
-  releases: IAsyncComputed<HelmRelease[]>;
-  upgradeChartTabStore: UpgradeChartTabStore;
-  updateRelease: CallForHelmReleaseUpdate;
+  model: UpgradeChartModel;
 }
 
 @observer
 export class NonInjectedUpgradeChart extends React.Component<UpgradeChartProps & Dependencies> {
-  @observable error?: string;
-  @observable versions = observable.array<ChartVersion>();
-  @observable version: ChartVersion | undefined = undefined;
-
-  constructor(props: UpgradeChartProps & Dependencies) {
-    super(props);
-    makeObservable(this);
-  }
-
-  componentDidMount() {
-    disposeOnUnmount(this, [
-      reaction(
-        () => this.release,
-        release => this.reloadVersions(release),
-        {
-          fireImmediately: true,
-        },
-      ),
-      reaction(
-        () => this.release?.getRevision(),
-        () => this.reloadValues(),
-        {
-          fireImmediately: true,
-        },
-      ),
-    ]);
-  }
-
-  get tabId() {
-    return this.props.tab.id;
-  }
-
-  get release() {
-    const tabData = this.props.upgradeChartTabStore.getData(this.tabId);
-
-    if (!tabData) return null;
-
-    return this.props.releases.value.get().find(release => release.getName() === tabData.releaseName);
-  }
-
-  get value() {
-    return this.props.upgradeChartTabStore.values.getData(this.tabId);
-  }
-
-  async reloadValues() {
-    this.props.upgradeChartTabStore.reloadValues(this.props.tab.id);
-  }
-
-  async reloadVersions(release: HelmRelease | null | undefined) {
-    if (!release) {
-      return;
-    }
-
-    this.version = undefined;
-    this.versions.clear();
-    const versions = await helmChartStore.getVersions(release.getChart());
-
-    this.versions.replace(versions);
-    this.version = first(this.versions);
-  }
-
-  onChange = action((value: string) => {
-    this.error = "";
-    this.props.upgradeChartTabStore.values.setData(this.tabId, value);
-  });
-
-  onError = action((error: Error | string) => {
-    this.error = error.toString();
-  });
-
   upgrade = async () => {
-    if (this.error || !this.release || !this.version || !this.value) {
-      return null;
+    const { model } = this.props;
+    const result = await model.submit();
+
+    if (result.callWasSuccessful) {
+      return (
+        <p>
+          {"Release "}
+          <b>{model.release.getName()}</b>
+          {" successfully upgraded to version "}
+          <b>{model.version.value.get()?.version}</b>
+        </p>
+      );
     }
 
-    const { version, repo } = this.version;
-    const releaseName = this.release.getName();
-    const releaseNs = this.release.getNs();
-
-    await this.props.updateRelease(releaseName, releaseNs, {
-      chart: this.release.getChart(),
-      values: this.value,
-      repo, version,
-    });
-
-    return (
-      <p>
-        {"Release "}
-        <b>{releaseName}</b>
-        {" successfully upgraded to version "}
-        <b>{version}</b>
-      </p>
-    );
+    throw result.error;
   };
 
   render() {
-    const { tabId, release, value, error, onChange, onError, upgrade, versions, version } = this;
-    const { className } = this.props;
-
-    if (!release || !this.props.upgradeChartTabStore.isReady(tabId) || !version) {
-      return <Spinner center />;
-    }
-    const currentVersion = release.getVersion();
-    const versionOptions = versions.map(version => ({
-      value: version,
-      label: `${version.repo}/${release.getChart()}-${version.version}`,
-    }));
-    const controlsAndInfo = (
-      <div className="upgrade flex gaps align-center">
-        <span>Release</span>
-        {" "}
-        <Badge label={release.getName()} />
-        <span>Namespace</span>
-        {" "}
-        <Badge label={release.getNs()} />
-        <span>Version</span>
-        {" "}
-        <Badge label={currentVersion} />
-        <span>Upgrade version</span>
-        <Select<ChartVersion, SelectOption<ChartVersion>, false>
-          id="char-version-input"
-          className="chart-version"
-          menuPlacement="top"
-          themeName="outlined"
-          value={version}
-          options={versionOptions}
-          onChange={option => this.version = option?.value}
-        />
-      </div>
-    );
+    const { model, className, tab } = this.props;
+    const tabId = tab.id;
+    const { release } = model;
 
     return (
-      <div className={cssNames("UpgradeChart flex column", className)}>
+      <div
+        className={cssNames("UpgradeChart flex column", className)}
+        data-testid={`upgrade-chart-dock-tab-contents-for-${release.getId()}`}
+      >
         <InfoPanel
           tabId={tabId}
-          error={error}
-          submit={upgrade}
+          error={model.configration.error.get()}
+          submit={this.upgrade}
           submitLabel="Upgrade"
           submittingMessage="Updating.."
-          controls={controlsAndInfo}
+          controls={(
+            <div className="upgrade flex gaps align-center">
+              <span>Release</span>
+              {" "}
+              <Badge label={release.getName()} />
+              <span>Namespace</span>
+              {" "}
+              <Badge label={release.getNs()} />
+              <span>Version</span>
+              {" "}
+              <Badge label={release.getVersion()} />
+              <span>Upgrade version</span>
+              <Select<HelmChartVersion, SelectOption<HelmChartVersion>, false>
+                id="char-version-input"
+                className="chart-version"
+                menuPlacement="top"
+                themeName="outlined"
+                value={model.version.value.get()}
+                options={model.versionOptions.get()}
+                onChange={model.version.set}
+              />
+            </div>
+          )}
         />
         <EditorPanel
           tabId={tabId}
-          value={value ?? ""}
-          onChange={onChange}
-          onError={onError}
+          value={model.configration.value.get()}
+          onChange={model.configration.set}
+          onError={model.configration.setError}
         />
       </div>
     );
@@ -193,10 +101,9 @@ export class NonInjectedUpgradeChart extends React.Component<UpgradeChartProps &
 }
 
 export const UpgradeChart = withInjectables<Dependencies, UpgradeChartProps>(NonInjectedUpgradeChart, {
-  getProps: (di, props) => ({
-    releases: di.inject(releasesInjectable),
-    updateRelease: di.inject(updateReleaseInjectable),
-    upgradeChartTabStore: di.inject(upgradeChartTabStoreInjectable),
+  getPlaceholder: () => <Spinner center />,
+  getProps: async (di, props) => ({
     ...props,
+    model: await di.inject(upgradeChartModelInjectable, props.tab),
   }),
 });
diff --git a/src/renderer/components/drawer/drawer-param-toggler.test.tsx b/src/renderer/components/drawer/drawer-param-toggler.test.tsx
index e9d5104afe..6a319cdd51 100644
--- a/src/renderer/components/drawer/drawer-param-toggler.test.tsx
+++ b/src/renderer/components/drawer/drawer-param-toggler.test.tsx
@@ -4,14 +4,19 @@
  */
 
 import type { RenderResult } from "@testing-library/react";
-import { render } from "@testing-library/react";
 import React from "react";
+import { getDiForUnitTesting } from "../../getDiForUnitTesting";
+import { type DiRender, renderFor } from "../test-utils/renderFor";
 import { DrawerParamToggler } from "./drawer-param-toggler";
 
 describe("<DrawerParamToggler />", () => {
   let result: RenderResult;
+  let render: DiRender;
 
   beforeEach(() => {
+    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    render = renderFor(di);
     result = render((
       <DrawerParamToggler
         label="Foo"
diff --git a/src/renderer/components/duration/reactive-duration.tsx b/src/renderer/components/duration/reactive-duration.tsx
index ce38b82509..42a6b0949b 100644
--- a/src/renderer/components/duration/reactive-duration.tsx
+++ b/src/renderer/components/duration/reactive-duration.tsx
@@ -18,19 +18,29 @@ export interface ReactiveDurationProps {
   compact?: boolean;
 }
 
+const everySecond = 1000;
+const everyMinute = 60 * 1000;
+
 /**
- * This function computes a resonable update
+ * This function computes a resonable update interval, matching `formatDuration`'s rules on when to display seconds
  */
-function computeUpdateInterval(creationTimestampEpoch: number): number {
+function computeUpdateInterval(creationTimestampEpoch: number, compact: boolean): number {
   const seconds = Math.floor((Date.now() - creationTimestampEpoch) / 1000);
   const minutes = Math.floor(seconds / 60);
 
   if (minutes < 10) {
-    // Update every second
-    return 1000;
+    return everySecond;
   }
 
-  return 60 * 1000;
+  if (compact) {
+    return everyMinute;
+  }
+
+  if (minutes < (60 * 3)) {
+    return everySecond;
+  }
+
+  return everyMinute;
 }
 
 export const ReactiveDuration = observer(({ timestamp, compact = true }: ReactiveDurationProps) => {
@@ -42,7 +52,7 @@ export const ReactiveDuration = observer(({ timestamp, compact = true }: Reactiv
 
   return (
     <>
-      {formatDuration(reactiveNow(computeUpdateInterval(timestampSeconds)) - timestampSeconds, compact)}
+      {formatDuration(reactiveNow(computeUpdateInterval(timestampSeconds, compact)) - timestampSeconds, compact)}
     </>
   );
 });
diff --git a/src/renderer/components/flexbox.scss b/src/renderer/components/flexbox.scss
new file mode 100644
index 0000000000..5ebad45641
--- /dev/null
+++ b/src/renderer/components/flexbox.scss
@@ -0,0 +1,114 @@
+//-- Flexbox
+.flex {
+  display: flex;
+
+  &.inline {
+    display: inline-flex;
+  }
+
+  &.fullsize {
+    width: 100vw;
+    height: 100vh;
+  }
+
+  &.column {
+    flex-direction: column;
+    &.reverse {
+      flex-direction: column-reverse;
+    }
+  }
+
+  &.reverse {
+    flex-direction: row-reverse;
+  }
+
+  &.wrap {
+    flex-wrap: wrap;
+    &-reverse {
+      flex-wrap: wrap-reverse;
+    }
+  }
+
+  &.auto {
+    > * {
+      flex: 1 1 0%;
+    }
+  }
+
+  &.center {
+    > * {
+      margin: auto;
+    }
+  }
+
+  $flex: flex-start flex-end center;
+  $justifyContent: join($flex, space-around space-between);
+  $alignContent: join($justifyContent, stretch);
+  $alignItems: join($flex, stretch baseline);
+
+  // align items in x-axis for flex=row (default) and in y-axis when flex=column mode
+  @each $mod in $justifyContent {
+    &.justify-#{$mod} {
+      justify-content: $mod;
+    }
+  }
+
+  @each $mod in $alignItems {
+    &.align-#{$mod} {
+      align-items: $mod;
+    }
+  }
+  @each $mod in $alignContent {
+    &.content-#{$mod} {
+      align-content: $mod;
+    }
+  }
+
+  // gaps
+  &.gaps {
+    $gap: var(--flex-gap, 1em);
+    &.column {
+      &:not(.reverse) > :not(:last-child) {
+        margin-bottom: $gap;
+      }
+      &.reverse > :not(:last-child) {
+        margin-top: $gap;
+      }
+    }
+    &:not(.column) {
+      &:not(.reverse) > :not(:last-child) {
+        margin-right: $gap;
+      }
+      &.reverse > :not(:last-child) {
+        margin-left: $gap;
+      }
+    }
+  }
+
+  // children
+  > .box {
+    &.grow {
+      flex: 1 0;
+      &-fixed {
+        flex: 1 0 0;
+      }
+    }
+    &.center {
+      margin: auto;
+    }
+    &.left {
+      margin-left: 0;
+      margin-right: auto;
+    }
+    &.right {
+      margin-right: 0;
+      margin-left: auto;
+    }
+
+    @each $mod in $alignItems {
+      &.self-#{$mod} {
+        align-self: $mod;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/renderer/components/gutter/gutter.module.scss b/src/renderer/components/gutter/gutter.module.scss
new file mode 100644
index 0000000000..2671090f19
--- /dev/null
+++ b/src/renderer/components/gutter/gutter.module.scss
@@ -0,0 +1,15 @@
+@mixin gutterSize(
+  $sizeName,
+  $size
+) {
+  .size-#{$sizeName} {
+    min-width: $size;
+    min-height: $size;
+  }
+}
+
+$baseline: 8px;
+
+@include gutterSize('sm', 2 * $baseline);
+@include gutterSize('md', 3 * $baseline);
+@include gutterSize('xl', 5 * $baseline);
diff --git a/src/renderer/components/gutter/gutter.tsx b/src/renderer/components/gutter/gutter.tsx
new file mode 100644
index 0000000000..c0fce2b6ba
--- /dev/null
+++ b/src/renderer/components/gutter/gutter.tsx
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { cssNames } from "../../utils";
+import styles from "./gutter.module.scss";
+
+interface GutterProps {
+  size?: "sm" | "md" | "xl";
+}
+
+const Gutter = ({ size = "md" }: GutterProps) => {
+  const classNames = cssNames(styles[`size-${size}`]);
+
+  return <div className={classNames} />;
+};
+
+
+export default Gutter;
diff --git a/src/renderer/components/horizontal-line/horizontal-line.module.scss b/src/renderer/components/horizontal-line/horizontal-line.module.scss
new file mode 100644
index 0000000000..91dc5106d3
--- /dev/null
+++ b/src/renderer/components/horizontal-line/horizontal-line.module.scss
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+.HorizontalLine {
+  height: 1px;
+  border-top: thin solid var(--hrColor);
+}
+
+@mixin horizontalLineSize(
+  $sizeName,
+  $size
+) {
+  .size-#{$sizeName} {
+  margin-top: $size;
+  margin-bottom: $size;
+  }
+}
+
+$baseline: 8px;
+
+@include horizontalLineSize('sm', 2 * $baseline);
+@include horizontalLineSize('md', 3 * $baseline);
+@include horizontalLineSize('xl', 5 * $baseline);
diff --git a/src/renderer/components/horizontal-line/horizontal-line.tsx b/src/renderer/components/horizontal-line/horizontal-line.tsx
new file mode 100644
index 0000000000..107a269b35
--- /dev/null
+++ b/src/renderer/components/horizontal-line/horizontal-line.tsx
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import styles from "./horizontal-line.module.scss";
+import { cssNames } from "../../utils";
+
+interface HorizontalLineProps {
+  size?: "sm" | "md" | "xl";
+}
+
+export const HorizontalLine = ({ size = "xl" }: HorizontalLineProps = { size: "xl" }) => {
+  const classNames = cssNames(styles.HorizontalLine, styles[`size-${size}`]);
+
+  return <div className={classNames} />;
+};
diff --git a/src/renderer/components/hotbar/hotbar-entity-icon.tsx b/src/renderer/components/hotbar/hotbar-entity-icon.tsx
index e07f320fad..b3f635acb5 100644
--- a/src/renderer/components/hotbar/hotbar-entity-icon.tsx
+++ b/src/renderer/components/hotbar/hotbar-entity-icon.tsx
@@ -17,11 +17,12 @@ import { Icon } from "../icon";
 import { HotbarIcon } from "./hotbar-icon";
 import { LensKubernetesClusterStatus } from "../../../common/catalog-entities/kubernetes-cluster";
 import type { VisitEntityContextMenu } from "../../../common/catalog/visit-entity-context-menu.injectable";
-import { navigate } from "../../navigation";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import catalogCategoryRegistryInjectable from "../../../common/catalog/category-registry.injectable";
 import visitEntityContextMenuInjectable from "../../../common/catalog/visit-entity-context-menu.injectable";
 import activeEntityInjectable from "../../api/catalog/entity/active.injectable";
+import type { Navigate } from "../../navigation/navigate.injectable";
+import navigateInjectable from "../../navigation/navigate.injectable";
 
 export interface HotbarEntityIconProps {
   entity: CatalogEntity;
@@ -38,13 +39,14 @@ interface Dependencies {
   visitEntityContextMenu: VisitEntityContextMenu;
   catalogCategoryRegistry: CatalogCategoryRegistry;
   activeEntity: IComputedValue<CatalogEntity | undefined>;
+  navigate: Navigate;
 }
 
 @observer
 class NonInjectedHotbarEntityIcon extends React.Component<HotbarEntityIconProps & Dependencies> {
   private readonly menuItems = observable.array<CatalogEntityContextMenu>();
 
-  get kindIcon() {
+  private renderKindIcon() {
     const className = styles.badge;
     const category = this.props.catalogCategoryRegistry.getCategoryForEntity(this.props.entity);
 
@@ -59,7 +61,7 @@ class NonInjectedHotbarEntityIcon extends React.Component<HotbarEntityIconProps
     return <Icon material={category.metadata.icon} className={className} />;
   }
 
-  get ledIcon() {
+  private renderLedIcon() {
     if (this.props.entity.kind !== "KubernetesCluster") {
       return null;
     }
@@ -86,7 +88,7 @@ class NonInjectedHotbarEntityIcon extends React.Component<HotbarEntityIconProps
 
     this.props.visitEntityContextMenu(this.props.entity, {
       menuItems: this.menuItems,
-      navigate,
+      navigate: this.props.navigate,
     });
   }
 
@@ -113,8 +115,8 @@ class NonInjectedHotbarEntityIcon extends React.Component<HotbarEntityIconProps
         )}
         onClick={onClick}
       >
-        { this.ledIcon }
-        { this.kindIcon }
+        {this.renderLedIcon()}
+        {this.renderKindIcon()}
       </HotbarIcon>
     );
   }
@@ -126,5 +128,6 @@ export const HotbarEntityIcon = withInjectables<Dependencies, HotbarEntityIconPr
     catalogCategoryRegistry: di.inject(catalogCategoryRegistryInjectable),
     visitEntityContextMenu: di.inject(visitEntityContextMenuInjectable),
     activeEntity: di.inject(activeEntityInjectable),
+    navigate: di.inject(navigateInjectable),
   }),
 });
diff --git a/src/renderer/components/icon/icon.test.tsx b/src/renderer/components/icon/icon.test.tsx
new file mode 100644
index 0000000000..f927caa7da
--- /dev/null
+++ b/src/renderer/components/icon/icon.test.tsx
@@ -0,0 +1,93 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import React from "react";
+import type { Logger } from "../../../common/logger";
+import loggerInjectable from "../../../common/logger.injectable";
+import { getDiForUnitTesting } from "../../getDiForUnitTesting";
+import type { DiRender } from "../test-utils/renderFor";
+import { renderFor } from "../test-utils/renderFor";
+import { Icon } from "./icon";
+
+describe("<Icon> href technical tests", () => {
+  let render: DiRender;
+  let logger: jest.MockedObject<Logger>;
+
+  beforeEach(() => {
+    const di = getDiForUnitTesting();
+
+    logger = {
+      debug: jest.fn(),
+      error: jest.fn(),
+      info: jest.fn(),
+      silly: jest.fn(),
+      warn: jest.fn(),
+    };
+
+    di.override(loggerInjectable, () => logger);
+
+    render = renderFor(di);
+  });
+
+  it("should render an <Icon> with http href", () => {
+    const result = render((
+      <Icon
+        data-testid="my-icon"
+        href="http://localhost"
+      />
+    ));
+
+    const icon = result.queryByTestId("my-icon");
+
+    expect(icon).toBeInTheDocument();
+    expect(icon).toHaveAttribute("href", "http://localhost");
+    expect(logger.warn).not.toBeCalled();
+  });
+
+  it("should render an <Icon> with https href", () => {
+    const result = render((
+      <Icon
+        data-testid="my-icon"
+        href="https://localhost"
+      />
+    ));
+
+    const icon = result.queryByTestId("my-icon");
+
+    expect(icon).toBeInTheDocument();
+    expect(icon).toHaveAttribute("href", "https://localhost");
+    expect(logger.warn).not.toBeCalled();
+  });
+
+  it("should warn about ws hrefs", () => {
+    const result = render((
+      <Icon
+        data-testid="my-icon"
+        href="ws://localhost"
+      />
+    ));
+
+    const icon = result.queryByTestId("my-icon");
+
+    expect(icon).toBeInTheDocument();
+    expect(icon).not.toHaveAttribute("href", "ws://localhost");
+    expect(logger.warn).toBeCalled();
+  });
+
+  it("should warn about javascript: hrefs", () => {
+    const result = render((
+      <Icon
+        data-testid="my-icon"
+        href="javascript:void 0"
+      />
+    ));
+
+    const icon = result.queryByTestId("my-icon");
+
+    expect(icon).toBeInTheDocument();
+    expect(icon).not.toHaveAttribute("href", "javascript:void 0");
+    expect(logger.warn).toBeCalled();
+  });
+});
diff --git a/src/renderer/components/icon/icon.tsx b/src/renderer/components/icon/icon.tsx
index 7655194886..425b3235b0 100644
--- a/src/renderer/components/icon/icon.tsx
+++ b/src/renderer/components/icon/icon.tsx
@@ -34,6 +34,13 @@ import User from "./user.svg";
 import Users from "./users.svg";
 import Wheel from "./wheel.svg";
 import Workloads from "./workloads.svg";
+import type { Logger } from "../../../common/logger";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import loggerInjectable from "../../../common/logger.injectable";
+
+const hrefValidation = /https?:\/\//;
+
+const hrefIsSafe = (href: string) => Boolean(href.match(hrefValidation));
 
 /**
  * Mapping between the local file names and the svgs
@@ -155,16 +162,21 @@ export function isSvg(content: string): boolean {
   return String(content).includes("<svg");
 }
 
-const RawIcon = withTooltip((props: IconProps) => {
+interface Dependencies {
+  logger: Logger;
+}
+
+const RawIcon = (props: IconProps & Dependencies) => {
   const ref = createRef<HTMLAnchorElement>();
 
   const {
-  // skip passing props to icon's html element
+    // skip passing props to icon's html element
     className, href, link, material, svg, size, smallest, small, big,
     disabled, sticker, active,
     focusable = true,
     children,
     interactive, onClick, onKeyDown,
+    logger,
     ...elemProps
   } = props;
   const isInteractive = interactive ?? !!(onClick || href || link);
@@ -245,16 +257,27 @@ const RawIcon = withTooltip((props: IconProps) => {
   }
 
   if (href) {
-    return (
-      <a
-        {...iconProps}
-        href={href}
-        ref={ref}
-      />
-    );
+    if (hrefIsSafe(href)) {
+      return (
+        <a
+          {...iconProps}
+          href={href}
+          ref={ref}
+        />
+      );
+    }
+
+    logger.warn("[ICON]: href prop is unsafe, blocking", { href });
   }
 
   return <i {...iconProps} ref={ref} />;
+};
+
+const InjectedIcon = withInjectables<Dependencies, IconProps>(RawIcon, {
+  getProps: (di, props) => ({
+    ...props,
+    logger: di.inject(loggerInjectable),
+  }),
 });
 
-export const Icon = Object.assign(RawIcon, { isSvg });
+export const Icon = Object.assign(withTooltip(InjectedIcon), { isSvg });
diff --git a/src/renderer/components/input/input.tsx b/src/renderer/components/input/input.tsx
index 3305c48e7b..bbbfa60a86 100644
--- a/src/renderer/components/input/input.tsx
+++ b/src/renderer/components/input/input.tsx
@@ -7,6 +7,7 @@ import "./input.scss";
 
 import type { DOMAttributes, InputHTMLAttributes, TextareaHTMLAttributes } from "react";
 import React from "react";
+import type { SingleOrMany } from "../../utils";
 import { autoBind, cssNames, debouncePromise, getRandId, isPromiseSettledFulfilled } from "../../utils";
 import { Icon } from "../icon";
 import type { TooltipProps } from "../tooltip";
@@ -72,7 +73,7 @@ export type InputProps = Omit<InputElementProps, "onChange" | "onSubmit"> & {
   iconLeft?: IconData;
   iconRight?: IconData;
   contentRight?: string | React.ReactNode; // Any component of string goes after iconRight
-  validators?: InputValidator<boolean> | InputValidator<boolean>[];
+  validators?: SingleOrMany<InputValidator>;
   blurOnEnter?: boolean;
   onChange?(value: string, evt: React.ChangeEvent<InputElement>): void;
   onSubmit?(value: string, evt: React.KeyboardEvent<InputElement>): void;
diff --git a/src/renderer/components/item-object-list/content.tsx b/src/renderer/components/item-object-list/content.tsx
index 07756760a9..530d6255cb 100644
--- a/src/renderer/components/item-object-list/content.tsx
+++ b/src/renderer/components/item-object-list/content.tsx
@@ -195,7 +195,7 @@ class NonInjectedItemListLayoutContent<
       )
       : (
         <p>
-          Remove
+          {"Remove "}
           <b>{selectedCount}</b>
           {" items "}
           <b>{selectedNames}</b>
@@ -252,7 +252,7 @@ class NonInjectedItemListLayoutContent<
   }
 
   renderTableHeader() {
-    const { customizeTableRowProps, renderTableHeader, isSelectable, isConfigurable, store } = this.props;
+    const { customizeTableRowProps, renderTableHeader, isSelectable, isConfigurable, store, tableId } = this.props;
 
     if (!renderTableHeader) {
       return null;
@@ -283,7 +283,10 @@ class NonInjectedItemListLayoutContent<
             ))
         }
         <TableCell className="menu">
-          {isConfigurable && this.renderColumnVisibilityMenu()}
+          {(isConfigurable && tableId)
+            ? this.renderColumnVisibilityMenu(tableId)
+            : undefined
+          }
         </TableCell>
       </TableHead>
     );
@@ -341,8 +344,8 @@ class NonInjectedItemListLayoutContent<
     return !isConfigurable || !tableId || !this.props.userStore.isTableColumnHidden(tableId, columnId, showWithColumn);
   }
 
-  renderColumnVisibilityMenu() {
-    const { renderTableHeader = [], tableId } = this.props;
+  renderColumnVisibilityMenu(tableId: string) {
+    const { renderTableHeader = [] } = this.props;
 
     return (
       <MenuActions
@@ -354,20 +357,16 @@ class NonInjectedItemListLayoutContent<
         {
           renderTableHeader
             .filter(isDefined)
-            .map((cellProps, index) => (
-              !cellProps.showWithColumn && (
-                <MenuItem key={index} className="input">
-                  <Checkbox
-                    label={cellProps.title ?? `<${cellProps.className}>`}
-                    value={this.showColumn(cellProps)}
-                    onChange={(
-                      tableId
-                        ? (() => cellProps.id && this.props.userStore.toggleTableColumnVisibility(tableId, cellProps.id))
-                        : undefined
-                    )}
-                  />
-                </MenuItem>
-              )
+            .filter((props): props is TableCellProps & { id: string } => !!props.id)
+            .filter(props => !props.showWithColumn)
+            .map((cellProps) => (
+              <MenuItem key={cellProps.id} className="input">
+                <Checkbox
+                  label={cellProps.title ?? `<${cellProps.className}>`}
+                  value={this.showColumn(cellProps)}
+                  onChange={() => this.props.userStore.toggleTableColumnVisibility(tableId, cellProps.id)}
+                />
+              </MenuItem>
             ))
         }
       </MenuActions>
diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/lease-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/lease-detail-item.injectable.ts
new file mode 100644
index 0000000000..baaabbf730
--- /dev/null
+++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/lease-detail-item.injectable.ts
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token";
+import { computed } from "mobx";
+import { LeaseDetails } from "../../../+config-leases";
+import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version";
+import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable";
+
+const leaseDetailItemInjectable = getInjectable({
+  id: "lease-detail-item",
+
+  instantiate: (di) => {
+    const kubeObject = di.inject(currentKubeObjectInDetailsInjectable);
+
+    return {
+      Component: LeaseDetails,
+      enabled: computed(() => isLease(kubeObject.get())),
+      orderNumber: 10,
+    };
+  },
+
+  injectionToken: kubeObjectDetailItemInjectionToken,
+});
+
+const isLease = kubeObjectMatchesToKindAndApiVersion(
+  "Lease",
+  ["coordination.k8s.io/v1"],
+);
+
+export default leaseDetailItemInjectable;
diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/runtime-class-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/runtime-class-detail-item.injectable.ts
new file mode 100644
index 0000000000..446d515dbc
--- /dev/null
+++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/runtime-class-detail-item.injectable.ts
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token";
+import { computed } from "mobx";
+import { RuntimeClassesDetails } from "../../../+config-runtime-classes";
+import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version";
+import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable";
+
+const runtimeClassDetailItemInjectable = getInjectable({
+  id: "runtime-class-detail-item",
+
+  instantiate: (di) => {
+    const kubeObject = di.inject(currentKubeObjectInDetailsInjectable);
+
+    return {
+      Component: RuntimeClassesDetails,
+      enabled: computed(() => isRuntimeClass(kubeObject.get())),
+      orderNumber: 10,
+    };
+  },
+
+  injectionToken: kubeObjectDetailItemInjectionToken,
+});
+
+const isRuntimeClass = kubeObjectMatchesToKindAndApiVersion(
+  "RuntimeClass",
+  ["node.k8s.io/v1"],
+);
+
+export default runtimeClassDetailItemInjectable;
diff --git a/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx b/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx
index 03ffef3199..707351c231 100644
--- a/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx
+++ b/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx
@@ -49,6 +49,18 @@ interface Dependencies {
   toggleKubeDetailsPane: ToggleKubeDetailsPane;
 }
 
+const getLoadErrorMessage = (error: unknown): string => {
+  if (error instanceof Error) {
+    if (error.cause) {
+      return `${error.message}: ${getLoadErrorMessage(error.cause)}`;
+    }
+
+    return error.message;
+  }
+
+  return `${error}`;
+};
+
 @observer
 class NonInjectedKubeObjectListLayout<
   K extends KubeObject,
@@ -59,7 +71,7 @@ class NonInjectedKubeObjectListLayout<
     subscribeStores: true,
   };
 
-  private loadErrors = observable.array<string>();
+  private readonly loadErrors = observable.array<string>();
 
   @computed get selectedItem() {
     return this.props.store.getByPath(this.props.kubeSelectedUrlParam.get());
@@ -78,7 +90,9 @@ class NonInjectedKubeObjectListLayout<
     if (subscribeStores) {
       reactions.push(
         this.props.subscribeToStores(stores, {
-          onLoadFailure: error => this.loadErrors.push(String(error)),
+          onLoadFailure: error => {
+            this.loadErrors.push(getLoadErrorMessage(error));
+          },
         }),
       );
     }
diff --git a/src/renderer/components/kube-object-menu/kube-object-menu-items/cron-job-menu.injectable.ts b/src/renderer/components/kube-object-menu/kube-object-menu-items/cron-job-menu.injectable.ts
index 256e49736f..10113dee76 100644
--- a/src/renderer/components/kube-object-menu/kube-object-menu-items/cron-job-menu.injectable.ts
+++ b/src/renderer/components/kube-object-menu/kube-object-menu-items/cron-job-menu.injectable.ts
@@ -13,7 +13,10 @@ const cronJobMenuInjectable = getInjectable({
 
   instantiate: () => (  {
     kind: "CronJob",
-    apiVersions: ["batch/v1beta1"],
+    apiVersions: [
+      "batch/v1beta1",
+      "batch/v1",
+    ],
     Component: CronJobMenu as KubeObjectMenuItemComponent,
     enabled: computed(() => true),
     orderNumber: 20,
diff --git a/src/renderer/components/kube-object-meta/kube-object-meta.tsx b/src/renderer/components/kube-object-meta/kube-object-meta.tsx
index 20852d95ba..f339877eb2 100644
--- a/src/renderer/components/kube-object-meta/kube-object-meta.tsx
+++ b/src/renderer/components/kube-object-meta/kube-object-meta.tsx
@@ -62,13 +62,7 @@ const NonInjectedKubeObjectMeta = observer(({
       <DrawerItem name="Created" hidden={isHidden("creationTimestamp")}>
         <KubeObjectAge object={object} compact={false} />
         {" ago "}
-        {creationTimestamp && (
-          <>
-            (
-            <LocaleDate date={creationTimestamp} />
-            )
-          </>
-        )}
+        {creationTimestamp && <LocaleDate date={creationTimestamp} />}
       </DrawerItem>
       <DrawerItem name="Name" hidden={isHidden("name")}>
         {getName()}
diff --git a/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx b/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx
index 3028faa902..fd497c9c35 100644
--- a/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx
+++ b/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx
@@ -5,121 +5,95 @@
 
 import styles from "./kubeconfig-dialog.module.scss";
 import React from "react";
-import { makeObservable, observable } from "mobx";
+import type { IObservableValue } from "mobx";
 import { observer } from "mobx-react";
-import yaml from "js-yaml";
-import type { ServiceAccount } from "../../../common/k8s-api/endpoints";
 import { cssNames, saveFileDialog } from "../../utils";
 import { Button } from "../button";
 import type { DialogProps } from "../dialog";
 import { Dialog } from "../dialog";
 import { Icon } from "../icon";
-import { Notifications } from "../notifications";
+import type { ShowNotification } from "../notifications";
 import { Wizard, WizardStep } from "../wizard";
-import { apiBase } from "../../api";
 import { MonacoEditor } from "../monaco-editor";
 import { clipboard } from "electron";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import showSuccessNotificationInjectable from "../notifications/show-success-notification.injectable";
+import kubeconfigDialogStateInjectable from "./state.injectable";
 
 export interface KubeconfigDialogData {
   title?: React.ReactNode;
-  loader: () => Promise<any>;
+  config: string;
 }
 
 export interface KubeConfigDialogProps extends Partial<DialogProps> {
 }
 
-const dialogState = observable.box<KubeconfigDialogData | undefined>();
+interface Dependencies {
+  state: IObservableValue<KubeconfigDialogData | undefined>;
+  showSuccessNotification: ShowNotification;
+}
 
 @observer
-export class KubeConfigDialog extends React.Component<KubeConfigDialogProps> {
-  @observable config = ""; // parsed kubeconfig in yaml format
-
-  constructor(props: KubeConfigDialogProps) {
+class NonInjectedKubeConfigDialog extends React.Component<KubeConfigDialogProps & Dependencies> {
+  constructor(props: KubeConfigDialogProps & Dependencies) {
     super(props);
-    makeObservable(this);
-  }
-
-  static open(data: KubeconfigDialogData) {
-    dialogState.set(data);
-  }
-
-  static close() {
-    dialogState.set(undefined);
   }
 
   close = () => {
-    KubeConfigDialog.close();
+    this.props.state.set(undefined);
   };
 
-  onOpen = (data: KubeconfigDialogData) => {
-    this.loadConfig(data);
+  copyToClipboard = (config: string) => {
+    clipboard.writeText(config);
+    this.props.showSuccessNotification("Config copied to clipboard");
   };
 
-  async loadConfig(data: KubeconfigDialogData) {
-    const config = await data.loader().catch(err => {
-      Notifications.error(err);
-      this.close();
-    });
-
-    this.config = config ? yaml.dump(config) : "";
-  }
-
-  copyToClipboard = () => {
-    clipboard.writeText(this.config);
-    Notifications.ok("Config copied to clipboard");
+  download = (config: string) => {
+    saveFileDialog("config", config, "text/yaml");
   };
 
-  download = () => {
-    saveFileDialog("config", this.config, "text/yaml");
-  };
-
-  renderContents(data: KubeconfigDialogData) {
-    const yamlConfig = this.config;
-
-    return (
-      <Wizard header={<h5>{data.title || "Kubeconfig File"}</h5>}>
-        <WizardStep
-          customButtons={(
-            <div className="actions flex gaps">
-              <Button plain onClick={this.copyToClipboard}>
-                <Icon material="assignment"/>
-                {" Copy to clipboard"}
-              </Button>
-              <Button plain onClick={this.download}>
-                <Icon material="cloud_download"/>
-                {" Download file"}
-              </Button>
-              <Button
-                plain
-                className="box right"
-                onClick={this.close}
-              >
-                Close
-              </Button>
-            </div>
-          )}
-          prev={this.close}
-        >
-          <MonacoEditor
-            readOnly
-            className={styles.editor}
-            value={yamlConfig}
-          />
-        </WizardStep>
-      </Wizard>
-    );
-  }
+  renderContents = (data: KubeconfigDialogData) => (
+    <Wizard header={<h5>{ data.title || "Kubeconfig File" }</h5>}>
+      <WizardStep
+        customButtons={ (
+          <div className="actions flex gaps">
+            <Button plain onClick={() => this.copyToClipboard(data.config)}>
+              <Icon material="assignment" />
+              {" Copy to clipboard"}
+            </Button>
+            <Button plain onClick={() => this.download(data.config)}>
+              <Icon material="cloud_download" />
+              {" Download file"}
+            </Button>
+            <Button
+              plain
+              className="box right"
+              onClick={this.close}
+            >
+              Close
+            </Button>
+          </div>
+        ) }
+        prev={this.close}
+      >
+        <MonacoEditor
+          readOnly
+          className={styles.editor}
+          value={data.config}
+        />
+      </WizardStep>
+    </Wizard>
+  );
 
   render() {
-    const { className, ...dialogProps } = this.props;
-    const data = dialogState.get();
+    const { className, state, ...dialogProps } = this.props;
+    const data = state.get();
 
     return (
       <Dialog
         {...dialogProps}
         className={cssNames(styles.KubeConfigDialog, className)}
-        isOpen={Boolean(data)}
-        onOpen={data && (() => this.onOpen(data))}
+        isOpen={!!data}
         close={this.close}
       >
         {data && this.renderContents(data)}
@@ -128,12 +102,10 @@ export class KubeConfigDialog extends React.Component<KubeConfigDialogProps> {
   }
 }
 
-export function openServiceAccountKubeConfig(account: ServiceAccount) {
-  const accountName = account.getName();
-  const namespace = account.getNs();
-
-  KubeConfigDialog.open({
-    title: `${accountName} kubeconfig`,
-    loader: () => apiBase.get(`/kubeconfig/service-account/${namespace}/${accountName}`),
-  });
-}
+export const KubeConfigDialog = withInjectables<Dependencies, KubeConfigDialogProps>(NonInjectedKubeConfigDialog, {
+  getProps: (di, props) => ({
+    ...props,
+    showSuccessNotification: di.inject(showSuccessNotificationInjectable),
+    state: di.inject(kubeconfigDialogStateInjectable),
+  }),
+});
diff --git a/src/renderer/components/kubeconfig-dialog/open-service-account-kube-config-dialog.injectable.ts b/src/renderer/components/kubeconfig-dialog/open-service-account-kube-config-dialog.injectable.ts
new file mode 100644
index 0000000000..3a612dec2e
--- /dev/null
+++ b/src/renderer/components/kubeconfig-dialog/open-service-account-kube-config-dialog.injectable.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type { ServiceAccount } from "../../../common/k8s-api/endpoints";
+import { urlBuilderFor } from "../../../common/utils/buildUrl";
+import apiBaseInjectable from "../../k8s/api-base.injectable";
+import openKubeconfigDialogInjectable from "./open.injectable";
+
+export type OpenServiceAccountKubeConfigDialog = (account: ServiceAccount) => void;
+
+const serviceAccountConfigEndpoint = urlBuilderFor("/kubeconfig/service-account/:namespace/:name");
+
+const openServiceAccountKubeConfigDialogInjectable = getInjectable({
+  id: "open-service-account-kube-config-dialog",
+  instantiate: (di): OpenServiceAccountKubeConfigDialog => {
+    const apiBase = di.inject(apiBaseInjectable);
+    const openKubeconfigDialog = di.inject(openKubeconfigDialogInjectable);
+
+    return (account) => openKubeconfigDialog({
+      title: `${account.getName()} kubeconfig`,
+      loader: () => apiBase.get(serviceAccountConfigEndpoint.compile({
+        name: account.getName(),
+        namespace: account.getNs(),
+      })),
+    });
+  },
+});
+
+export default openServiceAccountKubeConfigDialogInjectable;
diff --git a/src/renderer/components/kubeconfig-dialog/open.injectable.ts b/src/renderer/components/kubeconfig-dialog/open.injectable.ts
new file mode 100644
index 0000000000..c3a0d7f87f
--- /dev/null
+++ b/src/renderer/components/kubeconfig-dialog/open.injectable.ts
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import type React from "react";
+import loggerInjectable from "../../../common/logger.injectable";
+import showCheckedErrorNotificationInjectable from "../notifications/show-checked-error.injectable";
+import kubeconfigDialogStateInjectable from "./state.injectable";
+
+export interface OpenKubeconfigDialogArgs {
+  title?: React.ReactNode;
+  loader: () => Promise<string>;
+}
+
+export type OpenKubeconfigDialog = (openArgs: OpenKubeconfigDialogArgs) => void;
+
+const openKubeconfigDialogInjectable = getInjectable({
+  id: "open-kubeconfig-dialog",
+  instantiate: (di): OpenKubeconfigDialog => {
+    const state = di.inject(kubeconfigDialogStateInjectable);
+    const showCheckedErrorNotification = di.inject(showCheckedErrorNotificationInjectable);
+    const logger = di.inject(loggerInjectable);
+
+    return ({ title, loader }) => {
+      (async () => {
+        try {
+          const config = await loader();
+
+          state.set({ title, config });
+        } catch (error) {
+          showCheckedErrorNotification(error, "Failed to retrive config for dialog");
+          logger.warn("[KUBEOCONFIG-DIALOG]: failed to retrived config for dialog", error);
+        }
+      })();
+    };
+  },
+});
+
+export default openKubeconfigDialogInjectable;
diff --git a/src/renderer/components/kubeconfig-dialog/state.injectable.ts b/src/renderer/components/kubeconfig-dialog/state.injectable.ts
new file mode 100644
index 0000000000..e85271cda6
--- /dev/null
+++ b/src/renderer/components/kubeconfig-dialog/state.injectable.ts
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { observable } from "mobx";
+import type { KubeconfigDialogData } from "./kubeconfig-dialog";
+
+const kubeconfigDialogStateInjectable = getInjectable({
+  id: "kubeconfig-dialog-state",
+  instantiate: () => observable.box<KubeconfigDialogData>(),
+});
+
+export default kubeconfigDialogStateInjectable;
diff --git a/src/renderer/components/layout/setting-layout.scss b/src/renderer/components/layout/setting-layout.scss
index 244b88b3dc..b37a68a569 100644
--- a/src/renderer/components/layout/setting-layout.scss
+++ b/src/renderer/components/layout/setting-layout.scss
@@ -121,14 +121,6 @@
     display: flex;
     flex-direction: column;
 
-    &:not(:first-of-type) {
-      margin-top: 40px;
-
-      &.small {
-        margin-top: 20px;
-      }
-    }
-
     h1, h2 {
       color: var(--textColorAccent);
     }
@@ -167,15 +159,14 @@
 
     hr {
       margin-top: 40px;
+      margin-bottom: 40px;
+
       height: 1px;
       border-top: thin solid var(--hrColor);
 
       &.small {
         margin-top: 20px;
-      }
-
-      &:last-child {
-        display: none;
+        margin-bottom: 20px;
       }
     }
 
diff --git a/src/renderer/components/layout/top-bar/start-state-sync.injectable.ts b/src/renderer/components/layout/top-bar/start-state-sync.injectable.ts
index 6f9370c679..588d30a73d 100644
--- a/src/renderer/components/layout/top-bar/start-state-sync.injectable.ts
+++ b/src/renderer/components/layout/top-bar/start-state-sync.injectable.ts
@@ -16,6 +16,7 @@ const startTopbarStateSyncInjectable = getInjectable({
     const ipcRenderer = di.inject(ipcRendererInjectable);
 
     return {
+      id: "start-topbar-state-sync",
       run: () => {
         ipcRenderer.on("history:can-go-back", action((event, canGoBack: boolean) => {
           state.prevEnabled = canGoBack;
diff --git a/src/renderer/components/layout/top-bar/toggle-maximize-window/toggle-maximize-window.global-override-for-injectable.ts b/src/renderer/components/layout/top-bar/toggle-maximize-window/toggle-maximize-window.global-override-for-injectable.ts
new file mode 100644
index 0000000000..e7584a243b
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/toggle-maximize-window/toggle-maximize-window.global-override-for-injectable.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import toggleMaximizeWindowInjectable from "./toggle-maximize-window.injectable";
+import { getGlobalOverrideForFunction } from "../../../../../common/test-utils/get-global-override-for-function";
+
+export default getGlobalOverrideForFunction(toggleMaximizeWindowInjectable);
diff --git a/src/renderer/components/layout/top-bar/toggle-maximize-window.injectable.ts b/src/renderer/components/layout/top-bar/toggle-maximize-window/toggle-maximize-window.injectable.ts
similarity index 78%
rename from src/renderer/components/layout/top-bar/toggle-maximize-window.injectable.ts
rename to src/renderer/components/layout/top-bar/toggle-maximize-window/toggle-maximize-window.injectable.ts
index 3ebecc3b39..639cf9300a 100644
--- a/src/renderer/components/layout/top-bar/toggle-maximize-window.injectable.ts
+++ b/src/renderer/components/layout/top-bar/toggle-maximize-window/toggle-maximize-window.injectable.ts
@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { WindowAction } from "../../../../common/ipc/window";
-import { requestWindowAction } from "../../../ipc";
+import { WindowAction } from "../../../../../common/ipc/window";
+import { requestWindowAction } from "../../../../ipc";
 
 const toggleMaximizeWindowInjectable = getInjectable({
   id: "toggle-maximize-window",
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/context-menu/context-menu-top-bar-item.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/context-menu/context-menu-top-bar-item.injectable.ts
new file mode 100644
index 0000000000..677120446c
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/context-menu/context-menu-top-bar-item.injectable.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import isLinuxInjectable from "../../../../../../common/vars/is-linux.injectable";
+import isWindowsInjectable from "../../../../../../common/vars/is-windows.injectable";
+import { computed } from "mobx";
+import { ContextMenu } from "./context-menu";
+import { topBarItemOnLeftSideInjectionToken } from "../top-bar-item-injection-token";
+
+const contextMenuTopBarItemInjectable = getInjectable({
+  id: "context-menu-top-bar-item",
+
+  instantiate: (di) => {
+    const isWindows = di.inject(isWindowsInjectable);
+    const isLinux = di.inject(isLinuxInjectable);
+
+    return {
+      id: "context-menu",
+      isShown: computed(() => isWindows || isLinux),
+      orderNumber: 10,
+      Component: ContextMenu,
+    };
+  },
+
+  injectionToken: topBarItemOnLeftSideInjectionToken,
+});
+
+export default contextMenuTopBarItemInjectable;
+
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/context-menu/context-menu.tsx b/src/renderer/components/layout/top-bar/top-bar-items/context-menu/context-menu.tsx
new file mode 100644
index 0000000000..d543b93fb1
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/context-menu/context-menu.tsx
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { withInjectables } from "@ogre-tools/injectable-react";
+import React from "react";
+import styles from "../../top-bar.module.scss";
+import openAppContextMenuInjectable from "./open-app-context-menu/open-app-context-menu.injectable";
+
+interface Dependencies {
+  openAppContextMenu: () => void;
+}
+
+const NonInjectedContextMenu = ({ openAppContextMenu }: Dependencies) => (
+  <div className={styles.winMenu}>
+    <div onClick={openAppContextMenu} data-testid="window-menu">
+      <svg
+        width="12"
+        height="12"
+        viewBox="0 0 12 12"
+        shapeRendering="crispEdges"
+      >
+        <path fill="currentColor" d="M0,8.5h12v1H0V8.5z" />
+        <path fill="currentColor" d="M0,5.5h12v1H0V5.5z" />
+        <path fill="currentColor" d="M0,2.5h12v1H0V2.5z" />
+      </svg>
+    </div>
+  </div>
+);
+
+export const ContextMenu = withInjectables<Dependencies>(
+  NonInjectedContextMenu,
+
+  {
+    getProps: (di) => ({
+      openAppContextMenu: di.inject(openAppContextMenuInjectable),
+    }),
+  },
+);
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/context-menu/open-app-context-menu/open-app-context-menu.global-override-for-injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/context-menu/open-app-context-menu/open-app-context-menu.global-override-for-injectable.ts
new file mode 100644
index 0000000000..2dfd22bb5e
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/context-menu/open-app-context-menu/open-app-context-menu.global-override-for-injectable.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import openAppContextMenuInjectable from "./open-app-context-menu.injectable";
+import { getGlobalOverrideForFunction } from "../../../../../../../common/test-utils/get-global-override-for-function";
+
+export default getGlobalOverrideForFunction(openAppContextMenuInjectable);
diff --git a/src/renderer/components/layout/top-bar/open-app-context-menu.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/context-menu/open-app-context-menu/open-app-context-menu.injectable.ts
similarity index 85%
rename from src/renderer/components/layout/top-bar/open-app-context-menu.injectable.ts
rename to src/renderer/components/layout/top-bar/top-bar-items/context-menu/open-app-context-menu/open-app-context-menu.injectable.ts
index 4d2bf911d3..48ce3ef2d4 100644
--- a/src/renderer/components/layout/top-bar/open-app-context-menu.injectable.ts
+++ b/src/renderer/components/layout/top-bar/top-bar-items/context-menu/open-app-context-menu/open-app-context-menu.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { emitOpenAppMenuAsContextMenu } from "../../../ipc";
+import { emitOpenAppMenuAsContextMenu } from "../../../../../../ipc";
 
 const openAppContextMenuInjectable = getInjectable({
   id: "open-app-context-menu",
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/go-back/go-back.global-override-for-injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/go-back/go-back.global-override-for-injectable.ts
new file mode 100644
index 0000000000..f0d421a883
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/go-back/go-back.global-override-for-injectable.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import goBackInjectable from "./go-back.injectable";
+import { getGlobalOverrideForFunction } from "../../../../../../../common/test-utils/get-global-override-for-function";
+
+export default getGlobalOverrideForFunction(goBackInjectable);
diff --git a/src/renderer/components/layout/top-bar/go-back.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/go-back/go-back.injectable.ts
similarity index 75%
rename from src/renderer/components/layout/top-bar/go-back.injectable.ts
rename to src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/go-back/go-back.injectable.ts
index 88a804bd9f..e0f1ed3666 100644
--- a/src/renderer/components/layout/top-bar/go-back.injectable.ts
+++ b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/go-back/go-back.injectable.ts
@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { WindowAction } from "../../../../common/ipc/window";
-import { requestWindowAction } from "../../../ipc";
+import { WindowAction } from "../../../../../../../common/ipc/window";
+import { requestWindowAction } from "../../../../../../ipc";
 
 const goBackInjectable = getInjectable({
   id: "go-back",
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/navigation-to-back-top-bar-item.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/navigation-to-back-top-bar-item.injectable.ts
new file mode 100644
index 0000000000..ce4f671531
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/navigation-to-back-top-bar-item.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { topBarItemOnLeftSideInjectionToken } from "../top-bar-item-injection-token";
+import { NavigationToBack } from "./navigation-to-back";
+
+const navigationToBackTopBarItemInjectable = getInjectable({
+  id: "navigation-to-back-top-bar-item",
+
+  instantiate: () => ({
+    id: "navigation-to-back",
+    isShown: computed(() => true),
+    orderNumber: 30,
+    Component: NavigationToBack,
+  }),
+
+  injectionToken: topBarItemOnLeftSideInjectionToken,
+});
+
+export default navigationToBackTopBarItemInjectable;
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/navigation-to-back.tsx b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/navigation-to-back.tsx
new file mode 100644
index 0000000000..ebb4f4b620
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/navigation-to-back.tsx
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { IComputedValue } from "mobx";
+import { Icon } from "../../../../icon";
+import topBarPrevEnabledInjectable from "./prev-enabled.injectable";
+import goBackInjectable from "./go-back/go-back.injectable";
+import { observer } from "mobx-react";
+
+interface Dependencies {
+  prevEnabled: IComputedValue<boolean>;
+  goBack: () => void;
+}
+
+const NonInjectedNavigationToBack = observer(({
+  prevEnabled,
+  goBack,
+}: Dependencies) => (
+  <Icon
+    data-testid="history-back"
+    material="arrow_back"
+    onClick={goBack}
+    disabled={!prevEnabled.get()}
+  />
+));
+
+export const NavigationToBack = withInjectables<Dependencies>(
+  NonInjectedNavigationToBack,
+
+  {
+    getProps: (di) => ({
+      prevEnabled: di.inject(topBarPrevEnabledInjectable),
+      goBack: di.inject(goBackInjectable),
+    }),
+  },
+);
diff --git a/src/renderer/components/layout/top-bar/prev-enabled.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/prev-enabled.injectable.ts
similarity index 89%
rename from src/renderer/components/layout/top-bar/prev-enabled.injectable.ts
rename to src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/prev-enabled.injectable.ts
index fcdf318e34..56012ffd13 100644
--- a/src/renderer/components/layout/top-bar/prev-enabled.injectable.ts
+++ b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-back/prev-enabled.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import topBarStateInjectable from "./state.injectable";
+import topBarStateInjectable from "../../state.injectable";
 
 const topBarPrevEnabledInjectable = getInjectable({
   id: "top-bar-prev-enabled",
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/go-forward/go-forward.global-override-for-injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/go-forward/go-forward.global-override-for-injectable.ts
new file mode 100644
index 0000000000..f4e2520381
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/go-forward/go-forward.global-override-for-injectable.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import goForwardInjectable from "./go-forward.injectable";
+import { getGlobalOverrideForFunction } from "../../../../../../../common/test-utils/get-global-override-for-function";
+
+export default getGlobalOverrideForFunction(goForwardInjectable);
diff --git a/src/renderer/components/layout/top-bar/go-forward.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/go-forward/go-forward.injectable.ts
similarity index 75%
rename from src/renderer/components/layout/top-bar/go-forward.injectable.ts
rename to src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/go-forward/go-forward.injectable.ts
index a4a69b66f5..a38055853b 100644
--- a/src/renderer/components/layout/top-bar/go-forward.injectable.ts
+++ b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/go-forward/go-forward.injectable.ts
@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { WindowAction } from "../../../../common/ipc/window";
-import { requestWindowAction } from "../../../ipc";
+import { WindowAction } from "../../../../../../../common/ipc/window";
+import { requestWindowAction } from "../../../../../../ipc";
 
 const goForwardInjectable = getInjectable({
   id: "go-forward",
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/navigation-to-forward-top-bar-item.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/navigation-to-forward-top-bar-item.injectable.ts
new file mode 100644
index 0000000000..6017ab93f4
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/navigation-to-forward-top-bar-item.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { NavigationToForward } from "./navigation-to-forward";
+import { topBarItemOnLeftSideInjectionToken } from "../top-bar-item-injection-token";
+
+const navigationToForwardTopBarItemInjectable = getInjectable({
+  id: "navigation-to-forward-top-bar-item",
+
+  instantiate: () => ({
+    id: "navigation-to-forward",
+    isShown: computed(() => true),
+    orderNumber: 40,
+    Component: NavigationToForward,
+  }),
+
+  injectionToken: topBarItemOnLeftSideInjectionToken,
+});
+
+export default navigationToForwardTopBarItemInjectable;
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/navigation-to-forward.tsx b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/navigation-to-forward.tsx
new file mode 100644
index 0000000000..b8c3e70095
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/navigation-to-forward.tsx
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { IComputedValue } from "mobx";
+import { Icon } from "../../../../icon";
+import topBarNextEnabledInjectable from "./next-enabled.injectable";
+import goForwardInjectable from "./go-forward/go-forward.injectable";
+import { observer } from "mobx-react";
+
+interface Dependencies {
+  nextEnabled: IComputedValue<boolean>;
+  goForward: () => void;
+}
+
+const NonInjectedNavigationToForward = observer(({
+  nextEnabled,
+  goForward,
+}: Dependencies) => (
+  <Icon
+    data-testid="history-forward"
+    material="arrow_forward"
+    onClick={goForward}
+    disabled={!nextEnabled.get()}
+  />
+));
+
+export const NavigationToForward = withInjectables<Dependencies>(
+  NonInjectedNavigationToForward,
+
+  {
+    getProps: (di) => ({
+      nextEnabled: di.inject(topBarNextEnabledInjectable),
+      goForward: di.inject(goForwardInjectable),
+    }),
+  },
+);
diff --git a/src/renderer/components/layout/top-bar/next-enabled.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/next-enabled.injectable.ts
similarity index 89%
rename from src/renderer/components/layout/top-bar/next-enabled.injectable.ts
rename to src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/next-enabled.injectable.ts
index 1347327ba6..496c7de6d0 100644
--- a/src/renderer/components/layout/top-bar/next-enabled.injectable.ts
+++ b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-forward/next-enabled.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import topBarStateInjectable from "./state.injectable";
+import topBarStateInjectable from "../../state.injectable";
 
 const topBarNextEnabledInjectable = getInjectable({
   id: "top-bar-next-enabled",
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-home/navigation-to-home-top-bar-item.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-home/navigation-to-home-top-bar-item.injectable.ts
new file mode 100644
index 0000000000..6d9e283cf5
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-home/navigation-to-home-top-bar-item.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { NavigationToHome } from "./navigation-to-home";
+import { topBarItemOnLeftSideInjectionToken } from "../top-bar-item-injection-token";
+
+const navigationToHomeTopBarItemInjectable = getInjectable({
+  id: "navigation-to-home-top-bar-item",
+
+  instantiate: () => ({
+    id: "navigation-to-home",
+    isShown: computed(() => true),
+    orderNumber: 20,
+    Component: NavigationToHome,
+  }),
+
+  injectionToken: topBarItemOnLeftSideInjectionToken,
+});
+
+export default navigationToHomeTopBarItemInjectable;
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-home/navigation-to-home.tsx b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-home/navigation-to-home.tsx
new file mode 100644
index 0000000000..99b11807db
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/navigation-to-home/navigation-to-home.tsx
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { IComputedValue } from "mobx";
+import { Icon } from "../../../../icon";
+import routeIsActiveInjectable from "../../../../../routes/route-is-active.injectable";
+import { observer } from "mobx-react";
+import welcomeRouteInjectable from "../../../../../../common/front-end-routing/routes/welcome/welcome-route.injectable";
+import navigateToWelcomeInjectable from "../../../../../../common/front-end-routing/routes/welcome/navigate-to-welcome.injectable";
+
+interface Dependencies {
+  disabled: IComputedValue<boolean>;
+  goHome: () => void;
+}
+
+const NonInjectedNavigationToHome = observer(({
+  disabled,
+  goHome,
+}: Dependencies) => (
+  <Icon
+    data-testid="home-button"
+    material="home"
+    onClick={goHome}
+    disabled={disabled.get()}
+  />
+));
+
+export const NavigationToHome = withInjectables<Dependencies>(
+  NonInjectedNavigationToHome,
+
+  {
+    getProps: (di) => ({
+      disabled: di.inject(
+        routeIsActiveInjectable,
+        di.inject(welcomeRouteInjectable),
+      ),
+
+      goHome: di.inject(navigateToWelcomeInjectable),
+    }),
+  },
+);
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/top-bar-item-injection-token.ts b/src/renderer/components/layout/top-bar/top-bar-items/top-bar-item-injection-token.ts
new file mode 100644
index 0000000000..bae1bd0464
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/top-bar-item-injection-token.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type React from "react";
+import { getInjectionToken } from "@ogre-tools/injectable";
+import type { IComputedValue } from "mobx";
+
+export interface TopBarItem {
+  id: string;
+  isShown: IComputedValue<boolean>;
+  orderNumber: number;
+  Component: React.ComponentType;
+}
+
+export const topBarItemOnRightSideInjectionToken = getInjectionToken<TopBarItem>({
+  id: "top-bar-item-on-right-side-injection-token",
+});
+
+export const topBarItemOnLeftSideInjectionToken = getInjectionToken<TopBarItem>({
+  id: "top-bar-item-on-left-side-injection-token",
+});
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/top-bar-items-on-left-side.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/top-bar-items-on-left-side.injectable.ts
new file mode 100644
index 0000000000..894ef95eaf
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/top-bar-items-on-left-side.injectable.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { pipeline } from "@ogre-tools/fp";
+import { getInjectable } from "@ogre-tools/injectable";
+import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
+import { filter, sortBy } from "lodash/fp";
+import { computed } from "mobx";
+import { topBarItemOnLeftSideInjectionToken } from "./top-bar-item-injection-token";
+
+const topBarItemsOnLeftSideInjectable = getInjectable({
+  id: "top-bar-items-on-left-side",
+
+  instantiate: (di) => {
+    const computedInjectMany = di.inject(computedInjectManyInjectable);
+
+    const items = computedInjectMany(topBarItemOnLeftSideInjectionToken);
+
+    return computed(() =>
+      pipeline(
+        items.get(),
+        filter((item) => item.isShown.get()),
+        sortBy(item => item.orderNumber),
+      ),
+    );
+  },
+});
+
+export default topBarItemsOnLeftSideInjectable;
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/top-bar-items-on-right-side.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/top-bar-items-on-right-side.injectable.ts
new file mode 100644
index 0000000000..7402509fe9
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/top-bar-items-on-right-side.injectable.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { pipeline } from "@ogre-tools/fp";
+import { getInjectable } from "@ogre-tools/injectable";
+import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
+import { filter, sortBy } from "lodash/fp";
+import { computed } from "mobx";
+import { topBarItemOnRightSideInjectionToken } from "./top-bar-item-injection-token";
+
+const topBarItemsOnRightSideInjectable = getInjectable({
+  id: "top-bar-items-on-right-side",
+
+  instantiate: (di) => {
+    const computedInjectMany = di.inject(computedInjectManyInjectable);
+
+    const items = computedInjectMany(topBarItemOnRightSideInjectionToken);
+
+    return computed(() =>
+      pipeline(
+        items.get(),
+        filter((item) => item.isShown.get()),
+        sortBy(item => item.orderNumber),
+      ),
+    );
+  },
+});
+
+export default topBarItemsOnRightSideInjectable;
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/top-bar-items.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/top-bar-items.injectable.ts
deleted file mode 100644
index 851834190f..0000000000
--- a/src/renderer/components/layout/top-bar/top-bar-items/top-bar-items.injectable.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { computed } from "mobx";
-import rendererExtensionsInjectable from "../../../../../extensions/renderer-extensions.injectable";
-
-const topBarItemsInjectable = getInjectable({
-  id: "top-bar-items",
-
-  instantiate: (di) => {
-    const extensions = di.inject(rendererExtensionsInjectable);
-
-    return computed(() =>
-      extensions.get().flatMap((extension) => extension.topBarItems),
-    );
-  },
-});
-
-export default topBarItemsInjectable;
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/window-controls/close-window/close-window.global-override-for-injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/window-controls/close-window/close-window.global-override-for-injectable.ts
new file mode 100644
index 0000000000..f8124bbbe5
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/window-controls/close-window/close-window.global-override-for-injectable.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import closeWindowInjectable from "./close-window.injectable";
+import { getGlobalOverrideForFunction } from "../../../../../../../common/test-utils/get-global-override-for-function";
+
+export default getGlobalOverrideForFunction(closeWindowInjectable);
diff --git a/src/renderer/components/layout/top-bar/close-window.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/window-controls/close-window/close-window.injectable.ts
similarity index 75%
rename from src/renderer/components/layout/top-bar/close-window.injectable.ts
rename to src/renderer/components/layout/top-bar/top-bar-items/window-controls/close-window/close-window.injectable.ts
index 906cf88427..b49711d01d 100644
--- a/src/renderer/components/layout/top-bar/close-window.injectable.ts
+++ b/src/renderer/components/layout/top-bar/top-bar-items/window-controls/close-window/close-window.injectable.ts
@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { WindowAction } from "../../../../common/ipc/window";
-import { requestWindowAction } from "../../../ipc";
+import { WindowAction } from "../../../../../../../common/ipc/window";
+import { requestWindowAction } from "../../../../../../ipc";
 
 const closeWindowInjectable = getInjectable({
   id: "close-window",
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/window-controls/maximize-window/maximize-window.global-override-for-injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/window-controls/maximize-window/maximize-window.global-override-for-injectable.ts
new file mode 100644
index 0000000000..e0056a6ee8
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/window-controls/maximize-window/maximize-window.global-override-for-injectable.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import maximizeWindowInjectable from "./maximize-window.injectable";
+import { getGlobalOverrideForFunction } from "../../../../../../../common/test-utils/get-global-override-for-function";
+
+export default getGlobalOverrideForFunction(maximizeWindowInjectable);
diff --git a/src/renderer/components/layout/top-bar/maximize-window.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/window-controls/maximize-window/maximize-window.injectable.ts
similarity index 76%
rename from src/renderer/components/layout/top-bar/maximize-window.injectable.ts
rename to src/renderer/components/layout/top-bar/top-bar-items/window-controls/maximize-window/maximize-window.injectable.ts
index bfcb2916c4..624979cf10 100644
--- a/src/renderer/components/layout/top-bar/maximize-window.injectable.ts
+++ b/src/renderer/components/layout/top-bar/top-bar-items/window-controls/maximize-window/maximize-window.injectable.ts
@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { WindowAction } from "../../../../common/ipc/window";
-import { requestWindowAction } from "../../../ipc";
+import { WindowAction } from "../../../../../../../common/ipc/window";
+import { requestWindowAction } from "../../../../../../ipc";
 
 const maximizeWindowInjectable = getInjectable({
   id: "maximize-window",
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/window-controls/window-controls-top-bar-item.injectable.ts b/src/renderer/components/layout/top-bar/top-bar-items/window-controls/window-controls-top-bar-item.injectable.ts
new file mode 100644
index 0000000000..e8bb0f2e8e
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/window-controls/window-controls-top-bar-item.injectable.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { topBarItemOnRightSideInjectionToken } from "../top-bar-item-injection-token";
+import { WindowControls } from "./window-controls";
+import isWindowsInjectable from "../../../../../../common/vars/is-windows.injectable";
+import isLinuxInjectable from "../../../../../../common/vars/is-linux.injectable";
+
+const windowControlsTopBarItemInjectable = getInjectable({
+  id: "window-controls-top-bar-item",
+
+  instantiate: (di) => {
+    const isWindows = di.inject(isWindowsInjectable);
+    const isLinux = di.inject(isLinuxInjectable);
+
+    return ({
+      id: "window-controls",
+      orderNumber: 900,
+      isShown: computed(() => (isWindows || isLinux)),
+      Component: WindowControls,
+    });
+  },
+
+  injectionToken: topBarItemOnRightSideInjectionToken,
+});
+
+export default windowControlsTopBarItemInjectable;
diff --git a/src/renderer/components/layout/top-bar/top-bar-items/window-controls/window-controls.tsx b/src/renderer/components/layout/top-bar/top-bar-items/window-controls/window-controls.tsx
new file mode 100644
index 0000000000..08cdee837f
--- /dev/null
+++ b/src/renderer/components/layout/top-bar/top-bar-items/window-controls/window-controls.tsx
@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import { cssNames } from "../../../../../utils";
+import styles from "../../top-bar.module.scss";
+import isLinuxInjectable from "../../../../../../common/vars/is-linux.injectable";
+import toggleMaximizeWindowInjectable from "../../toggle-maximize-window/toggle-maximize-window.injectable";
+import closeWindowInjectable from "./close-window/close-window.injectable";
+import maximizeWindowInjectable from "./maximize-window/maximize-window.injectable";
+
+interface Dependencies {
+  isLinux: boolean;
+  toggleMaximizeWindow: () => void;
+  closeWindow: () => void;
+  minimizeWindow: () => void;
+}
+
+const NonInjectedWindowControls = ({
+  isLinux,
+  toggleMaximizeWindow,
+  closeWindow,
+  minimizeWindow,
+}: Dependencies) => (
+  <div
+    className={cssNames(styles.windowButtons, {
+      [styles.linuxButtons]: isLinux,
+    })}
+  >
+    <div
+      className={styles.minimize}
+      data-testid="window-minimize"
+      onClick={minimizeWindow}
+    >
+      <svg shapeRendering="crispEdges" viewBox="0 0 12 12">
+        <rect
+          fill="currentColor"
+          width="10"
+          height="1"
+          x="1"
+          y="9" />
+      </svg>
+    </div>
+
+    <div
+      className={styles.maximize}
+      data-testid="window-maximize"
+      onClick={toggleMaximizeWindow}
+    >
+      <svg shapeRendering="crispEdges" viewBox="0 0 12 12">
+        <rect
+          width="9"
+          height="9"
+          x="1.5"
+          y="1.5"
+          fill="none"
+          stroke="currentColor"
+        />
+      </svg>
+    </div>
+
+    <div
+      className={styles.close}
+      data-testid="window-close"
+      onClick={closeWindow}
+    >
+      <svg shapeRendering="crispEdges" viewBox="0 0 12 12">
+        <polygon
+          fill="currentColor"
+          points="11 1.576 6.583 6 11 10.424 10.424 11 6 6.583 1.576 11 1 10.424 5.417 6 1 1.576 1.576 1 6 5.417 10.424 1"
+        />
+      </svg>
+    </div>
+  </div>
+);
+
+export const WindowControls = withInjectables<Dependencies>(
+  NonInjectedWindowControls,
+
+  {
+    getProps: (di) => ({
+      isLinux: di.inject(isLinuxInjectable),
+      toggleMaximizeWindow: di.inject(toggleMaximizeWindowInjectable),
+      closeWindow: di.inject(closeWindowInjectable),
+      minimizeWindow: di.inject(maximizeWindowInjectable),
+    }),
+  },
+);
diff --git a/src/renderer/components/layout/top-bar/top-bar.module.scss b/src/renderer/components/layout/top-bar/top-bar.module.scss
index 62aec82a9e..9b880442c6 100644
--- a/src/renderer/components/layout/top-bar/top-bar.module.scss
+++ b/src/renderer/components/layout/top-bar/top-bar.module.scss
@@ -4,13 +4,10 @@
  */
 
 .topBar {
-  display: flex;
   background-color: var(--layoutBackground);
   z-index: 2;
-  width: 100%;
   grid-area: topbar;
   height: var(--main-layout-header);
-  justify-content: space-between;
 
   /* Use topbar as draggable region */
   user-select: none;
@@ -18,26 +15,20 @@
 }
 
 .topBar .items {
+  justify-content: space-between;
   align-items: center;
   display: flex;
   height: 100%;
+  padding-left: calc(var(--padding) * 2);
+  padding-right: calc(var(--padding) * 2);
+}
+
+.preventedDragging {
   -webkit-app-region: no-drag;
+}
 
-  &:first-of-type {
-    padding-left: calc(var(--padding) * 2);
-
-    & > *:not(:empty) {
-      margin-right: calc(var(--padding) * 1.5);
-    }
-  }
-
-  &:last-of-type {
-    padding-right: calc(var(--padding) * 2);
-
-    & > *:not(:empty) {
-      margin-left: calc(var(--padding) * 1.5);
-    }
-  }
+.separator {
+  flex-basis: 100%;
 }
 
 :global(.is-mac) .topBar {
diff --git a/src/renderer/components/layout/top-bar/top-bar.test.tsx b/src/renderer/components/layout/top-bar/top-bar.test.tsx
index a32529cb91..749b3c7c26 100644
--- a/src/renderer/components/layout/top-bar/top-bar.test.tsx
+++ b/src/renderer/components/layout/top-bar/top-bar.test.tsx
@@ -11,17 +11,16 @@ import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
 import type { DiContainer } from "@ogre-tools/injectable";
 import type { DiRender } from "../../test-utils/renderFor";
 import { renderFor } from "../../test-utils/renderFor";
-import topBarItemsInjectable from "./top-bar-items/top-bar-items.injectable";
 import { computed, observable } from "mobx";
 import rendererExtensionsInjectable from "../../../../extensions/renderer-extensions.injectable";
-import closeWindowInjectable from "./close-window.injectable";
-import goBackInjectable from "./go-back.injectable";
-import goForwardInjectable from "./go-forward.injectable";
-import maximizeWindowInjectable from "./maximize-window.injectable";
-import openAppContextMenuInjectable from "./open-app-context-menu.injectable";
-import toggleMaximizeWindowInjectable from "./toggle-maximize-window.injectable";
+import closeWindowInjectable from "./top-bar-items/window-controls/close-window/close-window.injectable";
+import goBackInjectable from "./top-bar-items/navigation-to-back/go-back/go-back.injectable";
+import maximizeWindowInjectable from "./top-bar-items/window-controls/maximize-window/maximize-window.injectable";
+import openAppContextMenuInjectable from "./top-bar-items/context-menu/open-app-context-menu/open-app-context-menu.injectable";
+import toggleMaximizeWindowInjectable from "./toggle-maximize-window/toggle-maximize-window.injectable";
 import topBarStateInjectable from "./state.injectable";
 import platformInjectable from "../../../../common/vars/platform.injectable";
+import goForwardInjectable from "./top-bar-items/navigation-to-forward/go-forward/go-forward.injectable";
 
 describe("<TopBar/>", () => {
   let di: DiContainer;
@@ -54,6 +53,7 @@ describe("<TopBar/>", () => {
         nextEnabled: true,
       }));
     });
+
     it("renders w/o errors", () => {
       const { container } = render(<TopBar/>);
 
@@ -95,23 +95,6 @@ describe("<TopBar/>", () => {
       expect(goForward).toBeCalled();
     });
 
-    it("renders items", async () => {
-      const testId = "testId";
-      const text = "an item";
-
-      di.override(topBarItemsInjectable, () => computed(() => [
-        {
-          components: {
-            Item: () => <span data-testid={testId}>{text}</span>,
-          },
-        },
-      ]));
-
-      const { findByTestId } = render(<TopBar/>);
-
-      expect(await findByTestId(testId)).toHaveTextContent(text);
-    });
-
     describe("on macos", () => {
       beforeEach(() => {
         di.override(platformInjectable, () => "darwin");
diff --git a/src/renderer/components/layout/top-bar/top-bar.tsx b/src/renderer/components/layout/top-bar/top-bar.tsx
index 59382d56f0..98ccf1652a 100644
--- a/src/renderer/components/layout/top-bar/top-bar.tsx
+++ b/src/renderer/components/layout/top-bar/top-bar.tsx
@@ -4,200 +4,76 @@
  */
 
 import styles from "./top-bar.module.scss";
-import React, { useEffect, useRef } from "react";
+import React, { useEffect } from "react";
 import { observer } from "mobx-react";
 import type { IComputedValue } from "mobx";
-import { Icon } from "../../icon";
-import { cssNames } from "../../../utils";
-import topBarItemsInjectable from "./top-bar-items/top-bar-items.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import type { TopBarRegistration } from "./top-bar-registration";
-import isLinuxInjectable from "../../../../common/vars/is-linux.injectable";
-import isWindowsInjectable from "../../../../common/vars/is-windows.injectable";
-import type { NavigateToCatalog } from "../../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
-import navigateToCatalogInjectable from "../../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
-import catalogRouteInjectable from "../../../../common/front-end-routing/routes/catalog/catalog-route.injectable";
-import routeIsActiveInjectable from "../../../routes/route-is-active.injectable";
-import { UpdateButton } from "../../update-button";
-import topBarPrevEnabledInjectable from "./prev-enabled.injectable";
-import topBarNextEnabledInjectable from "./next-enabled.injectable";
-import openAppContextMenuInjectable from "./open-app-context-menu.injectable";
-import goBackInjectable from "./go-back.injectable";
-import goForwardInjectable from "./go-forward.injectable";
-import closeWindowInjectable from "./close-window.injectable";
-import maximizeWindowInjectable from "./maximize-window.injectable";
-import toggleMaximizeWindowInjectable from "./toggle-maximize-window.injectable";
+import toggleMaximizeWindowInjectable from "./toggle-maximize-window/toggle-maximize-window.injectable";
 import watchHistoryStateInjectable from "../../../remote-helpers/watch-history-state.injectable";
+import topBarItemsOnRightSideInjectable from "./top-bar-items/top-bar-items-on-right-side.injectable";
+import type { TopBarItem } from "./top-bar-items/top-bar-item-injection-token";
+import { Map } from "../../map/map";
+import Gutter from "../../gutter/gutter";
+import topBarItemsOnLeftSideInjectable from "./top-bar-items/top-bar-items-on-left-side.injectable";
 
 interface Dependencies {
-  navigateToCatalog: NavigateToCatalog;
-  catalogRouteIsActive: IComputedValue<boolean>;
-  items: IComputedValue<TopBarRegistration[]>;
-  isWindows: boolean;
-  isLinux: boolean;
-  prevEnabled: IComputedValue<Boolean>;
-  nextEnabled: IComputedValue<Boolean>;
-  openAppContextMenu: () => void;
-  goBack: () => void;
-  goForward: () => void;
-  minimizeWindow: () => void;
+  itemsOnLeft: IComputedValue<TopBarItem[]>;
+  itemsOnRight: IComputedValue<TopBarItem[]>;
   toggleMaximizeWindow: () => void;
-  closeWindow: () => void;
   watchHistoryState: () => () => void;
 }
 
-const NonInjectedTopBar = observer(({
-  items,
-  navigateToCatalog,
-  catalogRouteIsActive,
-  isWindows,
-  isLinux,
-  prevEnabled,
-  nextEnabled,
-  openAppContextMenu,
-  goBack,
-  goForward,
-  closeWindow,
-  minimizeWindow,
-  toggleMaximizeWindow,
-  watchHistoryState,
-}: Dependencies) => {
-  const elem = useRef<HTMLDivElement | null>(null);
+const NonInjectedTopBar = observer(
+  ({
+    itemsOnLeft,
+    itemsOnRight,
+    toggleMaximizeWindow,
+    watchHistoryState,
+  }: Dependencies) => {
+    useEffect(() => watchHistoryState(), []);
 
-  const goHome = () => {
-    navigateToCatalog();
-  };
+    return (
+      <div className={styles.topBar} onDoubleClick={toggleMaximizeWindow}>
+        <div className={styles.items}>
+          <Map
+            items={itemsOnLeft.get()}
+            getSeparator={() => <Gutter size="sm" />}
+          >
+            {toItemWhichWorksWithWindowDraggingAndDoubleClicking}
+          </Map>
 
-  const windowSizeToggle = (evt: React.MouseEvent) => {
-    if (elem.current === evt.target) {
-      toggleMaximizeWindow();
-    }
-  };
+          <div className={styles.separator} />
 
-  useEffect(() => watchHistoryState(), []);
-
-  return (
-    <div
-      className={styles.topBar}
-      onDoubleClick={windowSizeToggle}
-      ref={elem}
-    >
-      <div className={styles.items}>
-        {(isWindows || isLinux) && (
-          <div className={styles.winMenu}>
-            <div onClick={openAppContextMenu} data-testid="window-menu">
-              <svg
-                width="12"
-                height="12"
-                viewBox="0 0 12 12"
-                shapeRendering="crispEdges"
-              >
-                <path fill="currentColor" d="M0,8.5h12v1H0V8.5z" />
-                <path fill="currentColor" d="M0,5.5h12v1H0V5.5z" />
-                <path fill="currentColor" d="M0,2.5h12v1H0V2.5z" />
-              </svg>
-            </div>
-          </div>
-        )}
-        <Icon
-          data-testid="home-button"
-          material="home"
-          onClick={goHome}
-          disabled={catalogRouteIsActive.get()}
-        />
-        <Icon
-          data-testid="history-back"
-          material="arrow_back"
-          onClick={goBack}
-          disabled={!prevEnabled.get()}
-        />
-        <Icon
-          data-testid="history-forward"
-          material="arrow_forward"
-          onClick={goForward}
-          disabled={!nextEnabled.get()}
-        />
-        <UpdateButton />
+          <Map
+            items={itemsOnRight.get()}
+            getSeparator={() => <Gutter size="sm" />}
+          >
+            {toItemWhichWorksWithWindowDraggingAndDoubleClicking}
+          </Map>
+        </div>
       </div>
-      <div className={styles.items}>
-        {renderRegisteredItems(items.get())}
-        {(isWindows || isLinux) && (
-          <div className={cssNames(styles.windowButtons, { [styles.linuxButtons]: isLinux })}>
-            <div
-              className={styles.minimize}
-              data-testid="window-minimize"
-              onClick={minimizeWindow}
-            >
-              <svg shapeRendering="crispEdges" viewBox="0 0 12 12">
-                <rect
-                  fill="currentColor"
-                  width="10"
-                  height="1"
-                  x="1"
-                  y="9"
-                />
-              </svg>
-            </div>
-            <div
-              className={styles.maximize}
-              data-testid="window-maximize"
-              onClick={toggleMaximizeWindow}
-            >
-              <svg shapeRendering="crispEdges" viewBox="0 0 12 12">
-                <rect
-                  width="9"
-                  height="9"
-                  x="1.5"
-                  y="1.5"
-                  fill="none"
-                  stroke="currentColor"
-                />
-              </svg>
-            </div>
-            <div
-              className={styles.close}
-              data-testid="window-close"
-              onClick={closeWindow}
-            >
-              <svg shapeRendering="crispEdges" viewBox="0 0 12 12">
-                <polygon fill="currentColor" points="11 1.576 6.583 6 11 10.424 10.424 11 6 6.583 1.576 11 1 10.424 5.417 6 1 1.576 1.576 1 6 5.417 10.424 1" />
-              </svg>
-            </div>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-});
-
-const renderRegisteredItems = (items: TopBarRegistration[]) => (
-  items.map((registration, index) => {
-    if (!registration?.components?.Item) {
-      return null;
-    }
-
-    return <registration.components.Item key={index} />;
-  })
+    );
+  },
 );
 
 export const TopBar = withInjectables<Dependencies>(NonInjectedTopBar, {
   getProps: (di) => ({
-    navigateToCatalog: di.inject(navigateToCatalogInjectable),
-    items: di.inject(topBarItemsInjectable),
-    isLinux: di.inject(isLinuxInjectable),
-    isWindows: di.inject(isWindowsInjectable),
-    prevEnabled: di.inject(topBarPrevEnabledInjectable),
-    nextEnabled: di.inject(topBarNextEnabledInjectable),
-    catalogRouteIsActive: di.inject(
-      routeIsActiveInjectable,
-      di.inject(catalogRouteInjectable),
-    ),
-    openAppContextMenu: di.inject(openAppContextMenuInjectable),
-    goBack: di.inject(goBackInjectable),
-    goForward: di.inject(goForwardInjectable),
-    closeWindow: di.inject(closeWindowInjectable),
-    minimizeWindow: di.inject(maximizeWindowInjectable),
+    itemsOnLeft: di.inject(topBarItemsOnLeftSideInjectable),
+    itemsOnRight: di.inject(topBarItemsOnRightSideInjectable),
     toggleMaximizeWindow: di.inject(toggleMaximizeWindowInjectable),
     watchHistoryState: di.inject(watchHistoryStateInjectable),
   }),
 });
+
+const toItemWhichWorksWithWindowDraggingAndDoubleClicking = (
+  item: TopBarItem,
+) => (
+  <div
+    className={styles.preventedDragging}
+    onDoubleClick={(event) => {
+      return event.stopPropagation();
+    }}
+  >
+    <item.Component />
+  </div>
+);
diff --git a/src/renderer/components/map/__snapshots__/map.test.tsx.snap b/src/renderer/components/map/__snapshots__/map.test.tsx.snap
new file mode 100644
index 0000000000..0cd7134778
--- /dev/null
+++ b/src/renderer/components/map/__snapshots__/map.test.tsx.snap
@@ -0,0 +1,90 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Map given items and placeholder but no separator renders 1`] = `
+<body>
+  <div>
+    <div
+      data-testid="some-item-id"
+    />
+    <div
+      data-testid="some-other-item-id"
+    />
+  </div>
+</body>
+`;
+
+exports[`Map given more than one item and separator renders 1`] = `
+<body>
+  <div>
+    <div
+      data-testid="some-item-id"
+    />
+    <div
+      data-testid="separator"
+    >
+      Some separator
+    </div>
+    <div
+      data-testid="some-other-item-id"
+    />
+    <div
+      data-testid="separator"
+    >
+      Some separator
+    </div>
+    <div
+      data-testid="some-another-item-id"
+    />
+  </div>
+</body>
+`;
+
+exports[`Map given more than one item and separator using left and right renders 1`] = `
+<body>
+  <div>
+    <div
+      data-testid="some-item-id"
+    />
+    <div
+      data-testid="separator-between-some-item-id-and-some-other-item-id"
+    >
+      Some separator between
+      some-item-id
+      and
+      some-other-item-id
+    </div>
+    <div
+      data-testid="some-other-item-id"
+    />
+    <div
+      data-testid="separator-between-some-other-item-id-and-some-another-item-id"
+    >
+      Some separator between
+      some-other-item-id
+      and
+      some-another-item-id
+    </div>
+    <div
+      data-testid="some-another-item-id"
+    />
+  </div>
+</body>
+`;
+
+exports[`Map given no items and placeholder renders 1`] = `
+<body>
+  <div>
+    <div
+      data-testid="some-placeholder"
+    >
+      Some placeholder
+    </div>
+  </div>
+</body>
+`;
+
+exports[`Map given no items but no placeholder renders 1`] = `
+<body>
+  <div />
+</body>
+`;
diff --git a/src/renderer/components/map/map.test.tsx b/src/renderer/components/map/map.test.tsx
new file mode 100644
index 0000000000..cf45c0d7f1
--- /dev/null
+++ b/src/renderer/components/map/map.test.tsx
@@ -0,0 +1,159 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { RenderResult } from "@testing-library/react";
+import { render } from "@testing-library/react";
+import React from "react";
+import { Map } from "./map";
+
+describe("Map", () => {
+  describe("given no items and placeholder", () => {
+    let rendered: RenderResult;
+
+    beforeEach(() => {
+      rendered = render(
+        <Map
+          items={[]}
+          getPlaceholder={() => (
+            <div data-testid="some-placeholder">Some placeholder</div>
+          )}
+        >
+          {() => <div data-testid="some-row">Irrelevant</div>}
+        </Map>,
+      );
+    });
+
+    it("renders", () => {
+      expect(rendered.baseElement).toMatchSnapshot();
+    });
+
+    it("renders placeholder", () => {
+      expect(rendered.getByTestId("some-placeholder")).toBeInTheDocument();
+    });
+
+    it("does not render rows", () => {
+      expect(rendered.queryByTestId("some-row")).not.toBeInTheDocument();
+    });
+  });
+
+  describe("given no items but no placeholder", () => {
+    let rendered: RenderResult;
+
+    beforeEach(() => {
+      rendered = render(
+        <Map items={[]}>
+          {() => <div data-testid="some-row">Irrelevant</div>}
+        </Map>,
+      );
+    });
+
+    it("renders", () => {
+      expect(rendered.baseElement).toMatchSnapshot();
+    });
+
+    it("does not render rows", () => {
+      expect(rendered.queryByTestId("some-row")).not.toBeInTheDocument();
+    });
+  });
+
+  describe("given items and placeholder but no separator", () => {
+    let rendered: RenderResult;
+
+    beforeEach(() => {
+      rendered = render(
+        <Map
+          items={[{ id: "some-item-id" }, { id: "some-other-item-id" }]}
+          getPlaceholder={() => (
+            <div data-testid="some-placeholder">Some placeholder</div>
+          )}
+        >
+          {(item) => <div data-testid={item.id} />}
+        </Map>,
+      );
+    });
+
+    it("renders", () => {
+      expect(rendered.baseElement).toMatchSnapshot();
+    });
+
+    it("does not render placeholder", () => {
+      expect(
+        rendered.queryByTestId("some-placeholder"),
+      ).not.toBeInTheDocument();
+    });
+
+    it("renders items", () => {
+      expect(rendered.getByTestId("some-item-id")).toBeInTheDocument();
+    });
+  });
+
+  describe("given more than one item and separator", () => {
+    let rendered: RenderResult;
+
+    beforeEach(() => {
+      rendered = render(
+        <Map
+          items={[
+            { id: "some-item-id" },
+            { id: "some-other-item-id" },
+            { id: "some-another-item-id" },
+          ]}
+          getSeparator={() => <div data-testid="separator">Some separator</div>}
+        >
+          {(item) => <div data-testid={item.id} />}
+        </Map>,
+      );
+    });
+
+    it("renders", () => {
+      expect(rendered.baseElement).toMatchSnapshot();
+    });
+
+    it("renders items", () => {
+      expect(rendered.getByTestId("some-item-id")).toBeInTheDocument();
+    });
+
+    it("renders separator", () => {
+      expect(rendered.getAllByTestId("separator")).toHaveLength(2);
+    });
+  });
+
+  describe("given more than one item and separator using left and right", () => {
+    let rendered: RenderResult;
+
+    beforeEach(() => {
+      rendered = render(
+        <Map
+          items={[
+            { id: "some-item-id" },
+            { id: "some-other-item-id" },
+            { id: "some-another-item-id" },
+          ]}
+          getSeparator={(left, right) => (
+            <div data-testid={`separator-between-${left.id}-and-${right.id}`}>
+              Some separator between
+              {left.id}
+              and
+              {right.id}
+            </div>
+          )}
+        >
+          {(item) => <div data-testid={item.id} />}
+        </Map>,
+      );
+    });
+
+    it("renders", () => {
+      expect(rendered.baseElement).toMatchSnapshot();
+    });
+
+    it("renders items", () => {
+      expect(rendered.getByTestId("some-item-id")).toBeInTheDocument();
+    });
+
+    it("renders separator", () => {
+      expect(rendered.getByTestId("separator-between-some-item-id-and-some-other-item-id")).toBeInTheDocument();
+    });
+  });
+});
diff --git a/src/renderer/components/map/map.tsx b/src/renderer/components/map/map.tsx
new file mode 100644
index 0000000000..f3b660d041
--- /dev/null
+++ b/src/renderer/components/map/map.tsx
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { pipeline } from "@ogre-tools/fp";
+import { identity, map } from "lodash/fp";
+import React from "react";
+import type { GetSeparator } from "../../../common/utils/add-separator/add-separator";
+import { addSeparator } from "../../../common/utils/add-separator/add-separator";
+
+interface RequiredPropertiesForItem {
+  id: string;
+}
+
+interface MapProps<Item extends RequiredPropertiesForItem> {
+  items: Item[];
+  children: (item: Item) => React.ReactElement;
+  getPlaceholder?: () => React.ReactElement;
+  getSeparator?: GetSeparator<Item, React.ReactElement>;
+}
+
+export const Map = <Item extends RequiredPropertiesForItem>(
+  props: MapProps<Item>,
+) => {
+  const { items, getPlaceholder, getSeparator, children } = props;
+
+  if (items.length === 0) {
+    return getPlaceholder?.() || null;
+  }
+
+  return (
+    <>
+      {pipeline(
+        items,
+
+        map((item) => ({ item, render: () => children(item) })),
+
+        getSeparator
+          ? (items) =>
+            addSeparator(
+              (left, right) => ({
+                item: {
+                  id: `separator-between-${left.item.id}-and-${right.item.id}`,
+                },
+
+                render: () => getSeparator(left.item, right.item),
+              }),
+
+              items,
+            )
+          : identity,
+
+        map(({ render, item }) => (
+          <React.Fragment key={item.id}>{render()}</React.Fragment>
+        )),
+      )}
+    </>
+  );
+};
diff --git a/src/renderer/components/menu/menu.tsx b/src/renderer/components/menu/menu.tsx
index 582ad37af4..03dfc38259 100644
--- a/src/renderer/components/menu/menu.tsx
+++ b/src/renderer/components/menu/menu.tsx
@@ -13,9 +13,15 @@ import { Animate } from "../animate";
 import type { IconProps } from "../icon";
 import { Icon } from "../icon";
 import isEqual from "lodash/isEqual";
+import type { RequestAnimationFrame } from "../animate/request-animation-frame.injectable";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import requestAnimationFrameInjectable from "../animate/request-animation-frame.injectable";
 
 export const MenuContext = React.createContext<MenuContextValue | null>(null);
-export type MenuContextValue = Menu;
+export interface MenuContextValue {
+  readonly props: Readonly<MenuProps>;
+  close: () => void;
+}
 
 export interface MenuPosition {
   left?: boolean;
@@ -62,17 +68,21 @@ const defaultPropsMenu: Partial<MenuProps> = {
   animated: true,
 };
 
-export class Menu extends React.Component<MenuProps, State> {
+interface Dependencies {
+  requestAnimationFrame: RequestAnimationFrame;
+}
+
+class NonInjectedMenu extends React.Component<MenuProps & Dependencies, State> {
   static defaultProps = defaultPropsMenu as object;
 
-  constructor(props: MenuProps) {
+  constructor(props: MenuProps & Dependencies) {
     super(props);
     autoBind(this);
   }
-  public opener: HTMLElement | null = null;
-  public elem: HTMLUListElement | null = null;
+  private opener: HTMLElement | null = null;
+  private elem: HTMLUListElement | null = null;
   protected items: { [index: number]: MenuItem } = {};
-  public state: State = {};
+  state: State = {};
 
   get isOpen() {
     return !!this.props.isOpen;
@@ -88,15 +98,15 @@ export class Menu extends React.Component<MenuProps, State> {
       htmlFor,
       toggleEvent,
     } = this.props;
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const elem = this.elem!;
 
     if (!usePortal) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const parent = elem.parentElement!;
-      const position = window.getComputedStyle(parent).position;
+      if (this.elem?.parentElement) {
+        const { position } = window.getComputedStyle(this.elem.parentElement);
 
-      if (position === "static") parent.style.position = "relative";
+        if (position === "static") {
+          this.elem.parentElement.style.position = "relative";
+        }
+      }
     } else if (this.isOpen) {
       this.refreshPosition();
     }
@@ -126,6 +136,8 @@ export class Menu extends React.Component<MenuProps, State> {
     window.removeEventListener("resize", this.onWindowResize);
     window.removeEventListener("click", this.onClickOutside, true);
     window.removeEventListener("scroll", this.onScrollOutside, true);
+    window.removeEventListener("blur", this.onBlur, true);
+    window.removeEventListener("contextmenu", this.onContextMenu, true);
   }
 
   componentDidUpdate(prevProps: MenuProps) {
@@ -372,6 +384,13 @@ export class Menu extends React.Component<MenuProps, State> {
   }
 }
 
+export const Menu = withInjectables<Dependencies, MenuProps>(NonInjectedMenu, {
+  getProps: (di, props) => ({
+    ...props,
+    requestAnimationFrame: di.inject(requestAnimationFrameInjectable),
+  }),
+});
+
 export function SubMenu(props: Partial<MenuProps>) {
   const { className, ...menuProps } = props;
 
diff --git a/src/renderer/components/render-delay/__tests__/__snapshots__/render-delay.test.tsx.snap b/src/renderer/components/render-delay/__tests__/__snapshots__/render-delay.test.tsx.snap
new file mode 100644
index 0000000000..1591010403
--- /dev/null
+++ b/src/renderer/components/render-delay/__tests__/__snapshots__/render-delay.test.tsx.snap
@@ -0,0 +1,37 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<RenderDelay/> when rendered with placeholder renders 1`] = `
+<body>
+  <div>
+    <div
+      data-testid="placeholder"
+    />
+  </div>
+</body>
+`;
+
+exports[`<RenderDelay/> when rendered with placeholder when the idle callback is called renders 1`] = `
+<body>
+  <div>
+    <div
+      data-testid="child"
+    />
+  </div>
+</body>
+`;
+
+exports[`<RenderDelay/> when rendered without placeholder renders 1`] = `
+<body>
+  <div />
+</body>
+`;
+
+exports[`<RenderDelay/> when rendered without placeholder when the idle callback is called renders 1`] = `
+<body>
+  <div>
+    <div
+      data-testid="child"
+    />
+  </div>
+</body>
+`;
diff --git a/src/renderer/components/render-delay/__tests__/render-delay.test.tsx b/src/renderer/components/render-delay/__tests__/render-delay.test.tsx
index 444b024df3..c189e3f38e 100644
--- a/src/renderer/components/render-delay/__tests__/render-delay.test.tsx
+++ b/src/renderer/components/render-delay/__tests__/render-delay.test.tsx
@@ -3,23 +3,106 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import React from "react";
-import "@testing-library/jest-dom/extend-expect";
-import { render } from "@testing-library/react";
 import { RenderDelay } from "../render-delay";
-import { mockWindow } from "../../../../../__mocks__/windowMock";
-
-mockWindow();
+import type { DiRender } from "../../test-utils/renderFor";
+import { renderFor } from "../../test-utils/renderFor";
+import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
+import { advanceFakeTime, useFakeTime } from "../../../../common/test-utils/use-fake-time";
+import cancelIdleCallbackInjectable from "../cancel-idle-callback.injectable";
+import requestIdleCallbackInjectable from "../request-idle-callback.injectable";
+import type { RenderResult } from "@testing-library/react";
+import idleCallbackTimeoutInjectable from "../idle-callback-timeout.injectable";
 
 describe("<RenderDelay/>", () => {
-  it("renders w/o errors", () => {
-    const { container } = render(<RenderDelay><button>My button</button></RenderDelay>);
+  let render: DiRender;
 
-    expect(container).toBeInstanceOf(HTMLElement);
+  beforeEach(() => {
+    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    render = renderFor(di);
+
+    useFakeTime("2020-01-17 12:18:19");
+
+    di.override(cancelIdleCallbackInjectable, () => clearTimeout);
+    di.override(requestIdleCallbackInjectable, () => (callback, opts) => setTimeout(callback, opts.timeout) as any);
+    di.override(idleCallbackTimeoutInjectable, () => 5);
   });
 
-  it("renders it's child", () => {
-    const { getByText } = render(<RenderDelay><button>My button</button></RenderDelay>);
+  describe("when rendered without placeholder", () => {
+    let result: RenderResult;
 
-    expect(getByText("My button")).toBeInTheDocument();
+    beforeEach(() => {
+      result = render((
+        <RenderDelay>
+          <div data-testid="child" />
+        </RenderDelay>
+      ));
+    });
+
+    it("renders", () => {
+      expect(result.baseElement).toMatchSnapshot();
+    });
+
+    it("does not show the children yet", () => {
+      expect(result.queryByTestId("child")).not.toBeInTheDocument();
+    });
+
+    describe("when the idle callback is called", () => {
+      beforeEach(() => {
+        advanceFakeTime(5);
+      });
+
+      it("renders", () => {
+        expect(result.baseElement).toMatchSnapshot();
+      });
+
+      it("shows the children", () => {
+        expect(result.queryByTestId("child")).toBeInTheDocument();
+      });
+    });
+  });
+
+  describe("when rendered with placeholder", () => {
+    let result: RenderResult;
+
+    beforeEach(() => {
+      result = render((
+        <RenderDelay
+          placeholder={<div data-testid="placeholder"></div>}
+        >
+          <div data-testid="child" />
+        </RenderDelay>
+      ));
+    });
+
+    it("renders", () => {
+      expect(result.baseElement).toMatchSnapshot();
+    });
+
+    it("does not show the children yet", () => {
+      expect(result.queryByTestId("child")).not.toBeInTheDocument();
+    });
+
+    it("shows the placeholder", () => {
+      expect(result.queryByTestId("placeholder")).toBeInTheDocument();
+    });
+
+    describe("when the idle callback is called", () => {
+      beforeEach(() => {
+        advanceFakeTime(5);
+      });
+
+      it("renders", () => {
+        expect(result.baseElement).toMatchSnapshot();
+      });
+
+      it("shows the children", () => {
+        expect(result.queryByTestId("child")).toBeInTheDocument();
+      });
+
+      it("does not show the placeholder", () => {
+        expect(result.queryByTestId("placeholder")).not.toBeInTheDocument();
+      });
+    });
   });
 });
diff --git a/src/renderer/components/render-delay/cancel-idle-callback.global-override-for-injectable.ts b/src/renderer/components/render-delay/cancel-idle-callback.global-override-for-injectable.ts
new file mode 100644
index 0000000000..2bd7d0047f
--- /dev/null
+++ b/src/renderer/components/render-delay/cancel-idle-callback.global-override-for-injectable.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../../../common/test-utils/get-global-override";
+import cancelIdleCallbackInjectable from "./cancel-idle-callback.injectable";
+
+export default getGlobalOverride(cancelIdleCallbackInjectable, () => () => {});
diff --git a/src/renderer/components/render-delay/cancel-idle-callback.injectable.ts b/src/renderer/components/render-delay/cancel-idle-callback.injectable.ts
new file mode 100644
index 0000000000..c18d9dfa88
--- /dev/null
+++ b/src/renderer/components/render-delay/cancel-idle-callback.injectable.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+
+export type CancelIdleCallback = (handle: number) => void;
+
+const cancelIdleCallbackInjectable = getInjectable({
+  id: "cancel-idle-callback",
+  instantiate: (): CancelIdleCallback => window.cancelIdleCallback,
+  causesSideEffects: true,
+});
+
+export default cancelIdleCallbackInjectable;
diff --git a/src/renderer/components/render-delay/idle-callback-timeout.injectable.ts b/src/renderer/components/render-delay/idle-callback-timeout.injectable.ts
new file mode 100644
index 0000000000..e40657e55c
--- /dev/null
+++ b/src/renderer/components/render-delay/idle-callback-timeout.injectable.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+
+const idleCallbackTimeoutInjectable = getInjectable({
+  id: "idle-callback-timeout",
+  instantiate: () => 1000,
+});
+
+export default idleCallbackTimeoutInjectable;
diff --git a/src/renderer/components/render-delay/render-delay.tsx b/src/renderer/components/render-delay/render-delay.tsx
index 2ccdaff693..5951babe6d 100644
--- a/src/renderer/components/render-delay/render-delay.tsx
+++ b/src/renderer/components/render-delay/render-delay.tsx
@@ -3,42 +3,58 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import React from "react";
-import { makeObservable, observable } from "mobx";
-import { observer } from "mobx-react";
+import React, { useEffect, useState } from "react";
 import type { SingleOrMany } from "../../utils";
+import type { RequestIdleCallback } from "./request-idle-callback.injectable";
+import type { CancelIdleCallback } from "./cancel-idle-callback.injectable";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import cancelIdleCallbackInjectable from "./cancel-idle-callback.injectable";
+import requestIdleCallbackInjectable from "./request-idle-callback.injectable";
+import idleCallbackTimeoutInjectable from "./idle-callback-timeout.injectable";
 
 export interface RenderDelayProps {
   placeholder?: React.ReactNode;
   children: SingleOrMany<React.ReactNode>;
 }
 
-@observer
-export class RenderDelay extends React.Component<RenderDelayProps> {
-  @observable isVisible = false;
-
-  constructor(props: RenderDelayProps) {
-    super(props);
-    makeObservable(this);
-  }
-
-  componentDidMount() {
-    const guaranteedFireTime = 1000;
-
-    window.requestIdleCallback(this.showContents, { timeout: guaranteedFireTime });
-  }
-
-  componentWillUnmount() {
-    window.cancelIdleCallback(this.showContents);
-  }
-
-  showContents = () => this.isVisible = true;
-
-  render() {
-    if (!this.isVisible) {
-      return this.props.placeholder || null;
-    }
-
-    return this.props.children;
-  }
+interface Dependencies {
+  requestIdleCallback: RequestIdleCallback;
+  cancelIdleCallback: CancelIdleCallback;
+  idleCallbackTimeout: number;
 }
+
+const NonInjectedRenderDelay = (props: RenderDelayProps & Dependencies) => {
+  const {
+    cancelIdleCallback,
+    requestIdleCallback,
+    children,
+    placeholder,
+    idleCallbackTimeout,
+  } = props;
+  const [isVisible, setIsVisible] = useState(false);
+
+  useEffect(() => {
+    const handle = requestIdleCallback(() => setIsVisible(true), { timeout: idleCallbackTimeout });
+
+    return () => cancelIdleCallback(handle);
+  }, []);
+
+  return (
+    <>
+      {
+        isVisible
+          ? children
+          : placeholder
+      }
+    </>
+  );
+};
+
+export const RenderDelay = withInjectables<Dependencies, RenderDelayProps>(NonInjectedRenderDelay, {
+  getProps: (di, props) => ({
+    ...props,
+    cancelIdleCallback: di.inject(cancelIdleCallbackInjectable),
+    requestIdleCallback: di.inject(requestIdleCallbackInjectable),
+    idleCallbackTimeout: di.inject(idleCallbackTimeoutInjectable),
+  }),
+});
diff --git a/src/renderer/components/render-delay/request-idle-callback.global-override-for-injectable.ts b/src/renderer/components/render-delay/request-idle-callback.global-override-for-injectable.ts
new file mode 100644
index 0000000000..5dc3d7d916
--- /dev/null
+++ b/src/renderer/components/render-delay/request-idle-callback.global-override-for-injectable.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../../../common/test-utils/get-global-override";
+import requestIdleCallbackInjectable from "./request-idle-callback.injectable";
+
+export default getGlobalOverride(requestIdleCallbackInjectable, () => (callback) => {
+  callback();
+
+  return 0;
+});
diff --git a/src/renderer/components/render-delay/request-idle-callback.injectable.ts b/src/renderer/components/render-delay/request-idle-callback.injectable.ts
new file mode 100644
index 0000000000..fd58bcc851
--- /dev/null
+++ b/src/renderer/components/render-delay/request-idle-callback.injectable.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+
+export type RequestIdleCallback = (callback: () => void, options: { timeout: number }) => number;
+
+const requestIdleCallbackInjectable = getInjectable({
+  id: "request-idle-callback",
+  instantiate: (): RequestIdleCallback => window.requestIdleCallback,
+  causesSideEffects: true,
+});
+
+export default requestIdleCallbackInjectable;
diff --git a/src/renderer/components/resource-metrics/resource-metrics-text.tsx b/src/renderer/components/resource-metrics/resource-metrics-text.tsx
index cedf0d136f..2e10596dd3 100644
--- a/src/renderer/components/resource-metrics/resource-metrics-text.tsx
+++ b/src/renderer/components/resource-metrics/resource-metrics-text.tsx
@@ -4,14 +4,23 @@
  */
 
 import React from "react";
-import type { PodMetricData } from "../../../common/k8s-api/endpoints";
+import type { MetricData } from "../../../common/k8s-api/endpoints/metrics.api";
 import { getMetricLastPoints } from "../../../common/k8s-api/endpoints/metrics.api";
 import { bytesToUnits } from "../../utils";
 import { Badge } from "../badge";
 import { DrawerItem } from "../drawer";
 
+export interface ResourceMetricsTextMetrics {
+  cpuUsage?: MetricData;
+  cpuRequests?: MetricData;
+  cpuLimits?: MetricData;
+  memoryUsage?: MetricData;
+  memoryRequests?: MetricData;
+  memoryLimits?: MetricData;
+}
+
 export interface ResourceMetricsTextProps {
-  metrics: PodMetricData | null | undefined;
+  metrics: ResourceMetricsTextMetrics | null | undefined;
 }
 
 export function ResourceMetricsText({ metrics }: ResourceMetricsTextProps) {
@@ -19,7 +28,10 @@ export function ResourceMetricsText({ metrics }: ResourceMetricsTextProps) {
     return null;
   }
 
-  const { cpuUsage, memoryUsage } = getMetricLastPoints(metrics);
+  const {
+    cpuUsage = 0,
+    memoryUsage = 0,
+  } = getMetricLastPoints(metrics);
 
   return (
     <>
diff --git a/src/renderer/components/resource-metrics/resource-metrics.tsx b/src/renderer/components/resource-metrics/resource-metrics.tsx
index 0080491727..b845d8a4c1 100644
--- a/src/renderer/components/resource-metrics/resource-metrics.tsx
+++ b/src/renderer/components/resource-metrics/resource-metrics.tsx
@@ -16,13 +16,14 @@ import type { MetricData } from "../../../common/k8s-api/endpoints/metrics.api";
 
 export type AtLeastOneMetricTab = [MetricsTab, ...MetricsTab[]];
 
-export interface ResourceMetricsProps extends React.HTMLProps<any> {
+export interface ResourceMetricsProps<Keys extends string> {
   tabs: AtLeastOneMetricTab;
   object: KubeObject;
   loader?: () => void;
   interval?: number;
   className?: string;
-  metrics: Partial<Record<string, MetricData>> | null | undefined;
+  metrics: Partial<Record<Keys, MetricData>> | null | undefined;
+  children: React.ReactChild | React.ReactChild[];
 }
 
 export interface ResourceMetricsValue {
@@ -33,7 +34,7 @@ export interface ResourceMetricsValue {
 
 export const ResourceMetricsContext = createContext<ResourceMetricsValue | null>(null);
 
-export function ResourceMetrics({ object, loader = noop, interval = 60, tabs, children, className, metrics }: ResourceMetricsProps) {
+export function ResourceMetrics<Keys extends string>({ object, loader = noop, interval = 60, tabs, children, className, metrics }: ResourceMetricsProps<Keys>) {
   const [tab, setTab] = useState<MetricsTab>(tabs[0]);
 
   // This is done just incase `loader` is actually something like `() => Promise<void>`
diff --git a/src/renderer/components/scroll-spy/__tests__/scroll-spy.test.tsx b/src/renderer/components/scroll-spy/__tests__/scroll-spy.test.tsx
index 5fa2576cba..1dc21b6735 100644
--- a/src/renderer/components/scroll-spy/__tests__/scroll-spy.test.tsx
+++ b/src/renderer/components/scroll-spy/__tests__/scroll-spy.test.tsx
@@ -5,9 +5,11 @@
 
 import React from "react";
 import "@testing-library/jest-dom/extend-expect";
-import { render, screen, waitFor } from "@testing-library/react";
+import { screen, waitFor } from "@testing-library/react";
 import { ScrollSpy } from "../scroll-spy";
 import { RecursiveTreeView } from "../../tree-view";
+import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
+import { type DiRender, renderFor } from "../../test-utils/renderFor";
 
 const observe = jest.fn();
 
@@ -20,6 +22,14 @@ Object.defineProperty(window, "IntersectionObserver", {
 });
 
 describe("<ScrollSpy/>", () => {
+  let render: DiRender;
+
+  beforeEach(() => {
+    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    render = renderFor(di);
+  });
+
   it("renders w/o errors", () => {
     const { container } = render((
       <ScrollSpy
@@ -94,6 +104,14 @@ describe("<ScrollSpy/>", () => {
 
 
 describe("<TreeView/> dataTree inside <ScrollSpy/>", () => {
+  let render: DiRender;
+
+  beforeEach(() => {
+    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    render = renderFor(di);
+  });
+
   it("contains links to all sections", async () => {
     render((
       <ScrollSpy
diff --git a/src/renderer/components/status-bar/status-bar-item-injection-token.ts b/src/renderer/components/status-bar/status-bar-item-injection-token.ts
index 0fec934077..c2c4ecb289 100644
--- a/src/renderer/components/status-bar/status-bar-item-injection-token.ts
+++ b/src/renderer/components/status-bar/status-bar-item-injection-token.ts
@@ -7,6 +7,7 @@ import type { IComputedValue } from "mobx";
 import type React from "react";
 
 export interface StatusBarItem {
+  origin?: string;
   component: React.ComponentType<any>;
   position: "left" | "right";
   visible: IComputedValue<boolean>;
diff --git a/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx b/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx
index 71293126f7..ed909a8284 100644
--- a/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx
+++ b/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx
@@ -74,6 +74,7 @@ const toItemInjectableFor = (extension: LensRendererExtension, getRandomId: () =
       id,
 
       instantiate: () => ({
+        origin: extension.sanitizedExtensionId,
         component,
         position,
         visible: visible ?? computed(() => true),
diff --git a/src/renderer/components/status-bar/status-bar-items.injectable.tsx b/src/renderer/components/status-bar/status-bar-items.injectable.tsx
index 855b8654c9..2b5be6fdb3 100644
--- a/src/renderer/components/status-bar/status-bar-items.injectable.tsx
+++ b/src/renderer/components/status-bar/status-bar-items.injectable.tsx
@@ -10,9 +10,14 @@ import type { StatusBarItem } from "./status-bar-item-injection-token";
 import { statusBarItemInjectionToken } from "./status-bar-item-injection-token";
 import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
 
+interface StatusItem {
+  origin?: string;
+  component: React.ComponentType<StatusBarItemProps>;
+}
+
 export interface StatusBarItems {
-  right: React.ComponentType<StatusBarItemProps>[];
-  left: React.ComponentType<StatusBarItemProps>[];
+  right: StatusItem[];
+  left: StatusItem[];
 }
 
 interface Dependencies {
@@ -27,13 +32,16 @@ function getStatusBarItems({ registrations }: Dependencies): IComputedValue<Stat
     };
 
     for (const registration of registrations.get()) {
-      const { position = "right", component, visible } = registration;
+      const { position = "right", component, visible, origin } = registration;
 
       if (!visible.get()) {
         continue;
       }
 
-      res[position].push(component);
+      res[position].push({
+        origin,
+        component,
+      });
     }
 
     // This is done so that the first ones registered are closest to the corner
diff --git a/src/renderer/components/status-bar/status-bar.test.tsx b/src/renderer/components/status-bar/status-bar.test.tsx
index 8aaf40b9c4..82ce2e2852 100644
--- a/src/renderer/components/status-bar/status-bar.test.tsx
+++ b/src/renderer/components/status-bar/status-bar.test.tsx
@@ -65,7 +65,7 @@ describe("<StatusBar />", () => {
 
     builder.beforeWindowStart((windowDi) => {
       windowDi.override(statusBarItemsInjectable, () => computed(() => ({
-        right: [ () => <span data-testid={testId} >{text}</span> ],
+        right: [ { origin: testId, component: () => <span data-testid={testId} >{text}</span> }],
         left: [],
       }) as StatusBarItems));
     });
diff --git a/src/renderer/components/status-bar/status-bar.tsx b/src/renderer/components/status-bar/status-bar.tsx
index 1214a104c7..dabad3bf17 100644
--- a/src/renderer/components/status-bar/status-bar.tsx
+++ b/src/renderer/components/status-bar/status-bar.tsx
@@ -22,18 +22,24 @@ const NonInjectedStatusBar = observer(({ items }: Dependencies & StatusBarProps)
   const { left, right } = items.get();
 
   return (
-    <div className={styles.StatusBar}>
+    <div className={styles.StatusBar} data-testid="status-bar">
       <div className={styles.leftSide} data-testid="status-bar-left">
         {left.map((Item, index) => (
-          <div className={styles.item} key={index}>
-            <Item />
+          <div
+            className={styles.item}
+            key={index}
+            data-origin={Item.origin}>
+            {<Item.component/>}
           </div>
         ))}
       </div>
       <div className={styles.rightSide} data-testid="status-bar-right">
         {right.map((Item, index) => (
-          <div className={styles.item} key={index}>
-            <Item />
+          <div
+            className={styles.item}
+            key={index}
+            data-origin={Item.origin}>
+            {<Item.component/>}
           </div>
         ))}
       </div>
diff --git a/src/renderer/components/test-utils/discovery-of-html-elements.ts b/src/renderer/components/test-utils/discovery-of-html-elements.ts
new file mode 100644
index 0000000000..472199fc60
--- /dev/null
+++ b/src/renderer/components/test-utils/discovery-of-html-elements.ts
@@ -0,0 +1,115 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { RenderResult } from "@testing-library/react";
+
+type DiscoverySourceTypes = RenderResult | Element;
+
+export type QuerySingleElement = (
+  attributeName: string,
+  attributeValue?: string
+) => { discovered: Element | null } & Discover;
+
+export type GetSingleElement = (
+  attributeName: string,
+  attributeValue?: string
+) => { discovered: Element } & Discover;
+
+export type QueryAllElements = (attributeName: string) => {
+  discovered: Element[];
+  attributeValues: (string | null)[];
+};
+
+export interface Discover {
+  querySingleElement: QuerySingleElement;
+  queryAllElements: QueryAllElements;
+  getSingleElement: GetSingleElement;
+}
+
+export const discoverFor = (getSource: () => DiscoverySourceTypes): Discover => ({
+  querySingleElement: querySingleElement(getSource),
+  queryAllElements: queryAllElements(getSource),
+  getSingleElement: getSingleElement(getSource),
+});
+
+export const querySingleElement =
+  (getSource: () => DiscoverySourceTypes): QuerySingleElement =>
+    (attributeName, attributeValue) => {
+      const source = getSource();
+
+      const dataAttribute = `data-${attributeName}-test`;
+
+      const selector = attributeValue
+        ? `[${dataAttribute}="${attributeValue}"]`
+        : `[${dataAttribute}]`;
+
+      const discovered = getBaseElement(source).querySelector(selector);
+
+      const nestedDiscover = discoverFor(() => {
+        if (!discovered) {
+          throw new Error("Tried to do nested discover using source that does not exist");
+        }
+
+        return discovered;
+      });
+
+      return {
+        discovered,
+
+        ...nestedDiscover,
+      };
+    };
+
+export const queryAllElements =
+  (getSource: () => DiscoverySourceTypes): QueryAllElements =>
+    (attributeName) => {
+      const source = getSource();
+
+      const dataAttribute = `data-${attributeName}-test`;
+
+      const results = [
+        ...getBaseElement(source).querySelectorAll(`[${dataAttribute}]`),
+      ];
+
+      return {
+        discovered: results,
+
+        attributeValues: results.map((result) =>
+          result.getAttribute(dataAttribute),
+        ),
+      };
+    };
+
+export const getSingleElement =
+  (getSource: () => DiscoverySourceTypes): GetSingleElement =>
+    (attributeName, attributeValue) => {
+      const dataAttribute = `data-${attributeName}-test`;
+
+      const { discovered, ...nestedDiscover } = querySingleElement(getSource)(
+        attributeName,
+        attributeValue,
+      );
+
+      if (!discovered) {
+        const validValues =
+        queryAllElements(getSource)(attributeName).attributeValues;
+
+        if (attributeValue) {
+          throw new Error(
+            `Couldn't find HTML-element with attribute "${dataAttribute}" with value "${attributeValue}". Present values are:\n\n"${validValues.join(
+              '",\n"',
+            )}"`,
+          );
+        }
+
+        throw new Error(
+          `Couldn't find HTML-element with attribute "${dataAttribute}"`,
+        );
+      }
+
+      return { discovered, ...nestedDiscover };
+    };
+
+const getBaseElement = (source: DiscoverySourceTypes) =>
+  "baseElement" in source ? source.baseElement : source;
diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx
index 9f9ab7d903..575ea7b508 100644
--- a/src/renderer/components/test-utils/get-application-builder.tsx
+++ b/src/renderer/components/test-utils/get-application-builder.tsx
@@ -6,7 +6,7 @@ import type { LensRendererExtension } from "../../../extensions/lens-renderer-ex
 import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable";
 import currentlyInClusterFrameInjectable from "../../routes/currently-in-cluster-frame.injectable";
 import type { IComputedValue, ObservableMap } from "mobx";
-import { computed, observable, runInAction } from "mobx";
+import { action, computed, observable, runInAction } from "mobx";
 import React from "react";
 import { Router } from "react-router";
 import allowedResourcesInjectable from "../../cluster-frame-context/allowed-resources.injectable";
@@ -17,12 +17,8 @@ import type { DiContainer, Injectable } from "@ogre-tools/injectable";
 import { getInjectable } from "@ogre-tools/injectable";
 import mainExtensionsInjectable from "../../../extensions/main-extensions.injectable";
 import { pipeline } from "@ogre-tools/fp";
-import { compact, filter, first, flatMap, get, join, last, map, matches } from "lodash/fp";
-import preferenceNavigationItemsInjectable from "../+preferences/preferences-navigation/preference-navigation-items.injectable";
-import navigateToPreferencesInjectable from "../../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable";
-import type { MenuItemOpts } from "../../../main/menu/application-menu-items.injectable";
-import applicationMenuItemsInjectable from "../../../main/menu/application-menu-items.injectable";
-import type { MenuItem, MenuItemConstructorOptions } from "electron";
+import { filter, first, join, last, map, matches } from "lodash/fp";
+import navigateToPreferencesInjectable from "../../../features/preferences/common/navigate-to-preferences.injectable";
 import type { NavigateToHelmCharts } from "../../../common/front-end-routing/routes/cluster/helm/charts/navigate-to-helm-charts.injectable";
 import navigateToHelmChartsInjectable from "../../../common/front-end-routing/routes/cluster/helm/charts/navigate-to-helm-charts.injectable";
 import hostedClusterInjectable from "../../cluster-frame-context/hosted-cluster.injectable";
@@ -54,23 +50,43 @@ import { RootFrame } from "../../frames/root-frame/root-frame";
 import { ClusterFrame } from "../../frames/cluster-frame/cluster-frame";
 import hostedClusterIdInjectable from "../../cluster-frame-context/hosted-cluster-id.injectable";
 import activeKubernetesClusterInjectable from "../../cluster-frame-context/active-kubernetes-cluster.injectable";
-import { catalogEntityFromCluster } from "../../../main/cluster-manager";
+import { catalogEntityFromCluster } from "../../../main/cluster/manager";
 import namespaceStoreInjectable from "../+namespaces/store.injectable";
 import { isAllowedResource } from "../../../common/cluster/is-allowed-resource";
 import createApplicationWindowInjectable from "../../../main/start-main-application/lens-window/application-window/create-application-window.injectable";
 import type { CreateElectronWindow } from "../../../main/start-main-application/lens-window/application-window/create-electron-window.injectable";
 import createElectronWindowInjectable from "../../../main/start-main-application/lens-window/application-window/create-electron-window.injectable";
 import { applicationWindowInjectionToken } from "../../../main/start-main-application/lens-window/application-window/application-window-injection-token";
-import sendToChannelInElectronBrowserWindowInjectable from "../../../main/start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable";
 import closeAllWindowsInjectable from "../../../main/start-main-application/lens-window/hide-all-windows/close-all-windows.injectable";
 import type { LensWindow } from "../../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
 import type { FakeExtensionOptions } from "./get-extension-fake";
 import { getExtensionFakeForMain, getExtensionFakeForRenderer } from "./get-extension-fake";
+import namespaceApiInjectable from "../../../common/k8s-api/endpoints/namespace.api.injectable";
+import { Namespace } from "../../../common/k8s-api/endpoints";
+import { overrideFsWithFakes } from "../../../test-utils/override-fs-with-fakes";
+import applicationMenuItemCompositeInjectable from "../../../features/application-menu/main/application-menu-item-composite.injectable";
+import { getCompositePaths } from "../../../common/utils/composite/get-composite-paths/get-composite-paths";
+import { discoverFor } from "./discovery-of-html-elements";
+import { findComposite } from "../../../common/utils/composite/find-composite/find-composite";
+import shouldStartHiddenInjectable from "../../../main/electron-app/features/should-start-hidden.injectable";
 
 type Callback = (di: DiContainer) => void | Promise<void>;
 
 type LensWindowWithHelpers = LensWindow & { rendered: RenderResult; di: DiContainer };
 
+const createNamespacesFor = (namespaces: Set<string>): Namespace[] => (
+  Array.from(namespaces, (namespace) => new Namespace({
+    apiVersion: "v1",
+    kind: "Namespace",
+    metadata: {
+      name: namespace,
+      resourceVersion: "1",
+      selfLink: `/api/v1/namespaces/${namespace}`,
+      uid: `namespace-${namespace}`,
+    },
+  }))
+);
+
 export interface ApplicationBuilder {
   mainDi: DiContainer;
   setEnvironmentToClusterFrame: () => ApplicationBuilder;
@@ -99,6 +115,7 @@ export interface ApplicationBuilder {
   allowKubeResource: (resourceName: KubeResource) => ApplicationBuilder;
   beforeApplicationStart: (callback: Callback) => ApplicationBuilder;
   beforeWindowStart: (callback: Callback) => ApplicationBuilder;
+  afterWindowStart: (callback: Callback) => ApplicationBuilder;
 
   startHidden: () => Promise<void>;
   render: () => Promise<RenderResult>;
@@ -110,9 +127,9 @@ export interface ApplicationBuilder {
   };
 
   applicationMenu: {
-    click: (path: string) => void;
+    click: (...path: string[]) => void;
+    items: string[][];
   };
-
   preferences: {
     close: () => void;
     navigate: () => void;
@@ -121,7 +138,10 @@ export interface ApplicationBuilder {
       click: (id: string) => void;
     };
   };
-
+  namespaces: {
+    add: (namespace: string) => void;
+    select: (namespace: string) => void;
+  };
   helmCharts: {
     navigate: NavigateToHelmCharts;
   };
@@ -147,10 +167,15 @@ export const getApplicationBuilder = () => {
     mainDi.register(mainExtensionsStateInjectable);
   });
 
-  const overrideChannelsForWindow = overrideChannels(mainDi);
+  const { overrideForWindow, sendToWindow } = overrideChannels(mainDi);
 
   const beforeApplicationStartCallbacks: Callback[] = [];
   const beforeWindowStartCallbacks: Callback[] = [];
+  const afterWindowStartCallbacks: Callback[] = [];
+
+  const fsState = new Map();
+
+  overrideFsWithFakes(mainDi, fsState);
 
   let environment = environments.application;
 
@@ -184,7 +209,8 @@ export const getApplicationBuilder = () => {
 
     const windowDi = getRendererDi({ doGeneralOverrides: true });
 
-    overrideChannelsForWindow(windowDi, windowId);
+    overrideForWindow(windowDi, windowId);
+    overrideFsWithFakes(windowDi, fsState);
 
     runInAction(() => {
       windowDi.register(rendererExtensionsStateInjectable);
@@ -218,6 +244,10 @@ export const getApplicationBuilder = () => {
 
         await startFrame();
 
+        for (const callback of afterWindowStartCallbacks) {
+          await callback(windowDi);
+        }
+
         const history = windowDi.inject(historyInjectable);
 
         const render = renderFor(windowDi);
@@ -230,9 +260,7 @@ export const getApplicationBuilder = () => {
       },
 
       send: (arg) => {
-        const sendFake = mainDi.inject(sendToChannelInElectronBrowserWindowInjectable) as any;
-
-        sendFake(windowId, null, arg);
+        sendToWindow(windowId, arg);
       },
 
       reload: () => {
@@ -245,9 +273,12 @@ export const getApplicationBuilder = () => {
 
   let applicationHasStarted = false;
 
+  const namespaces = observable.set<string>();
+  const namespaceItems = observable.array<Namespace>();
+  const selectedNamespaces = observable.set<string>();
+
   const builder: ApplicationBuilder = {
     mainDi,
-
     applicationWindow: {
       closeAll: () => {
         const closeAll = mainDi.inject(closeAllWindowsInjectable);
@@ -283,11 +314,9 @@ export const getApplicationBuilder = () => {
           .map(toWindowWithHelpersFor(windowHelpers)),
 
       get: (id) => {
-        const applicationWindows = builder.applicationWindow.getAll();
-
-        const applicationWindow = applicationWindows.find(
-          (window) => window.id === id,
-        );
+        const applicationWindow = builder.applicationWindow
+          .getAll()
+          .find((window) => window.id === id);
 
         if (!applicationWindow) {
           throw new Error(`Tried to get application window with ID "${id}" but it was not found.`);
@@ -297,48 +326,42 @@ export const getApplicationBuilder = () => {
       },
 
       create: (id) => {
-        const createApplicationWindow = mainDi.inject(
-          createApplicationWindowInjectable,
-        );
+        const createApplicationWindow = mainDi.inject(createApplicationWindowInjectable);
 
         createApplicationWindow(id);
 
         return builder.applicationWindow.get(id);
       },
     },
-
+    namespaces: {
+      add: action((namespace) => {
+        namespaces.add(namespace);
+        namespaceItems.replace(createNamespacesFor(namespaces));
+      }),
+      select: action((namespace) => selectedNamespaces.add(namespace)),
+    },
     applicationMenu: {
-      click: (path: string) => {
-        const applicationMenuItems = mainDi.inject(
-          applicationMenuItemsInjectable,
-        );
+      get items() {
+        const composite = mainDi.inject(
+          applicationMenuItemCompositeInjectable,
+        ).get();
 
-        const menuItems = pipeline(
-          applicationMenuItems.get(),
-          flatMap(toFlatChildren(null)),
-          filter((menuItem) => !!menuItem.click),
-        );
+        return getCompositePaths(composite);
+      },
 
-        const menuItem = menuItems.find((menuItem) => menuItem.path === path);
+      click: (...path: string[]) => {
+        const composite = mainDi.inject(
+          applicationMenuItemCompositeInjectable,
+        ).get();
 
-        if (!menuItem) {
-          const availableIds = menuItems.map(get("path")).join('", "');
+        const clickableMenuItem = findComposite(...path)(composite).value;
 
-          throw new Error(
-            `Tried to click application menu item with ID "${path}" which does not exist. Available IDs are: "${availableIds}"`,
-          );
+        if(clickableMenuItem.kind === "clickable-menu-item") {
+          // Todo: prevent leaking of Electron
+          (clickableMenuItem.onClick as any)();
+        } else {
+          throw new Error(`Tried to trigger clicking of an application menu item, but item at path '${path.join(" -> ")}' isn't clickable.`);
         }
-
-        menuItem.click?.(
-          {
-            menu: null as never,
-            commandId: 0,
-            userAccelerator: null,
-            ...menuItem,
-          } as MenuItem,
-          undefined,
-          {},
-        );
       },
     },
 
@@ -409,24 +432,15 @@ export const getApplicationBuilder = () => {
       },
 
       navigation: {
-        click: (id: string) => {
-          const { di: windowDi, rendered } = builder.applicationWindow.only;
+        click: (pathId: string) => {
+          const { rendered } = builder.applicationWindow.only;
 
-          const link = rendered.queryByTestId(`tab-link-for-${id}`);
+          const discover = discoverFor(() => rendered);
 
-          if (!link) {
-            const preferencesNavigationItems = windowDi.inject(
-              preferenceNavigationItemsInjectable,
-            );
-
-            const availableIds = preferencesNavigationItems
-              .get()
-              .map(get("id"));
-
-            throw new Error(
-              `Tried to click navigation item "${id}" which does not exist in preferences. Available IDs are "${availableIds.join('", "')}"`,
-            );
-          }
+          const { discovered: link } = discover.getSingleElement(
+            "preference-tab-link",
+            pathId,
+          );
 
           fireEvent.click(link);
         },
@@ -461,6 +475,7 @@ export const getApplicationBuilder = () => {
         );
 
         const clusterStub = {
+          id: "some-cluster-id",
           accessibleNamespaces: [],
           isAllowedResource: isAllowedResource(allowedResourcesState),
         } as unknown as Cluster;
@@ -469,21 +484,26 @@ export const getApplicationBuilder = () => {
           computed(() => catalogEntityFromCluster(clusterStub)),
         );
 
+        windowDi.override(hostedClusterIdInjectable, () => clusterStub.id);
+
         // TODO: Figure out a way to remove this stub.
         const namespaceStoreStub = {
           isLoaded: true,
-          contextNamespaces: [],
-          contextItems: [],
-          api: {
-            kind: "Namespace",
+          get contextNamespaces() {
+            return Array.from(selectedNamespaces);
           },
-          items: [],
+          get allowedNamespaces() {
+            return Array.from(namespaces);
+          },
+          contextItems: namespaceItems,
+          api: windowDi.inject(namespaceApiInjectable),
+          items: namespaceItems,
           selectNamespaces: () => {},
           getByPath: () => undefined,
           pickOnlySelected: () => [],
           isSelectedAll: () => false,
-          getTotalCount: () => 0,
-        } as unknown as NamespaceStore;
+          getTotalCount: () => namespaceItems.length,
+        } as Partial<NamespaceStore> as NamespaceStore;
 
         const clusterFrameContextFake = new ClusterFrameContext(
           clusterStub,
@@ -495,7 +515,6 @@ export const getApplicationBuilder = () => {
 
         windowDi.override(namespaceStoreInjectable, () => namespaceStoreStub);
         windowDi.override(hostedClusterInjectable, () => clusterStub);
-        windowDi.override(hostedClusterIdInjectable, () => "irrelevant-hosted-cluster-id");
         windowDi.override(clusterFrameContextInjectable, () => clusterFrameContextFake);
 
         // Todo: get rid of global state.
@@ -615,6 +634,18 @@ export const getApplicationBuilder = () => {
       return builder;
     },
 
+    afterWindowStart(callback) {
+      const alreadyRenderedWindows = builder.applicationWindow.getAll();
+
+      alreadyRenderedWindows.forEach((window) => {
+        callback(window.di);
+      });
+
+      afterWindowStartCallbacks.push(callback);
+
+      return builder;
+    },
+
     startHidden: async () => {
       mainDi.inject(lensProxyPortInjectable).set(42);
 
@@ -622,11 +653,8 @@ export const getApplicationBuilder = () => {
         await callback(mainDi);
       }
 
-      const startMainApplication = mainDi.inject(
-        startMainApplicationInjectable,
-      );
-
-      await startMainApplication(false);
+      mainDi.override(shouldStartHiddenInjectable, () => true);
+      await mainDi.inject(startMainApplicationInjectable);
 
       applicationHasStarted = true;
     },
@@ -638,21 +666,15 @@ export const getApplicationBuilder = () => {
         await callback(mainDi);
       }
 
-      const startMainApplication = mainDi.inject(
-        startMainApplicationInjectable,
-      );
-
-      await startMainApplication(true);
+      mainDi.override(shouldStartHiddenInjectable, () => false);
+      await mainDi.inject(startMainApplicationInjectable);
 
       applicationHasStarted = true;
 
-      const applicationWindow = builder.applicationWindow.get(
-        "first-application-window",
-      );
-
-      assert(applicationWindow);
-
-      return applicationWindow.rendered;
+      return builder
+        .applicationWindow
+        .get("first-application-window")
+        .rendered;
     },
 
     select: {
@@ -695,25 +717,6 @@ export const getApplicationBuilder = () => {
   return builder;
 };
 
-export type ToFlatChildren = (opts: MenuItemConstructorOptions) => (MenuItemOpts & { path: string })[];
-
-function toFlatChildren(parentId: string | null | undefined): ToFlatChildren {
-  return ({ submenu = [], ...menuItem }) => [
-    {
-      ...menuItem,
-      path: pipeline([parentId, menuItem.id], compact, join(".")),
-    },
-    ...(
-      Array.isArray(submenu)
-        ? submenu.flatMap(toFlatChildren(menuItem.id))
-        : [{
-          ...submenu,
-          path: pipeline([parentId, menuItem.id], compact, join(".")),
-        }]
-    ),
-  ];
-}
-
 export const rendererExtensionsStateInjectable = getInjectable({
   id: "renderer-extensions-state",
   instantiate: () => observable.map<string, LensRendererExtension>(),
@@ -844,4 +847,3 @@ const disableExtensionFor =
         extensionsState.delete(id);
       });
     };
-
diff --git a/src/renderer/create-cluster/create-cluster.injectable.ts b/src/renderer/create-cluster/create-cluster.injectable.ts
index af64873fad..e0a9f51656 100644
--- a/src/renderer/create-cluster/create-cluster.injectable.ts
+++ b/src/renderer/create-cluster/create-cluster.injectable.ts
@@ -9,6 +9,7 @@ import directoryForKubeConfigsInjectable from "../../common/app-paths/directory-
 import { createClusterInjectionToken } from "../../common/cluster/create-cluster-injection-token";
 import loggerInjectable from "../../common/logger.injectable";
 import broadcastMessageInjectable from "../../common/ipc/broadcast-message.injectable";
+import loadConfigfromFileInjectable from "../../common/kube-helpers/load-config-from-file.injectable";
 
 const createClusterInjectable = getInjectable({
   id: "create-cluster",
@@ -18,6 +19,7 @@ const createClusterInjectable = getInjectable({
       directoryForKubeConfigs: di.inject(directoryForKubeConfigsInjectable),
       logger: di.inject(loggerInjectable),
       broadcastMessage: di.inject(broadcastMessageInjectable),
+      loadConfigfromFile: di.inject(loadConfigfromFileInjectable),
 
       // TODO: Dismantle wrong abstraction
       // Note: "as never" to get around strictness in unnatural scenario
@@ -25,7 +27,9 @@ const createClusterInjectable = getInjectable({
       createKubectl: () => { throw new Error("Tried to access back-end feature in front-end.");},
       createContextHandler: () => undefined as never,
       createAuthorizationReview: () => { throw new Error("Tried to access back-end feature in front-end."); },
+      createAuthorizationNamespaceReview: () => { throw new Error("Tried to access back-end feature in front-end."); },
       createListNamespaces: () => { throw new Error("Tried to access back-end feature in front-end."); },
+      createListApiResources: ()=> { throw new Error("Tried to access back-end feature in front-end."); },
       detectorRegistry: undefined as never,
       createVersionDetector: () => { throw new Error("Tried to access back-end feature in front-end."); },
     };
diff --git a/src/renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable.ts b/src/renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable.ts
index 24c75f4d30..b633b00d05 100644
--- a/src/renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable.ts
+++ b/src/renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable.ts
@@ -22,22 +22,19 @@ const extensionShouldBeEnabledForClusterFrameInjectable = getInjectable({
     ) =>
       untracked(() => di.inject(extensionIsEnabledForClusterInjectable, { extension, cluster }));
 
-    return asyncComputed(
-      async () => {
+    return asyncComputed({
+      getValueFromObservedPromise: async () => {
         const cluster = activeKubernetesCluster.get();
 
         if (!cluster) {
           return false;
         }
 
-        return getExtensionIsEnabledForCluster(
-          extension,
-          cluster,
-        );
+        return getExtensionIsEnabledForCluster(extension, cluster);
       },
 
-      false,
-    );
+      valueWhenPending: false,
+    });
   },
 
   lifecycle: lifecycleEnum.keyedSingleton({
diff --git a/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap b/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
index c491c391ae..d629d85798 100644
--- a/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
+++ b/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
@@ -383,6 +383,7 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -392,7 +393,9 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -849,6 +852,7 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -858,7 +862,9 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
@@ -1379,6 +1385,7 @@ exports[`<ClusterFrame /> given cluster without list nodes, but with namespaces
                     >
                       <i
                         class="Icon material interactive focusable small"
+                        data-testid="dock-tab-close-for-terminal"
                         tabindex="0"
                       >
                         <span
@@ -1388,7 +1395,9 @@ exports[`<ClusterFrame /> given cluster without list nodes, but with namespaces
                           close
                         </span>
                       </i>
-                      <div>
+                      <div
+                        data-testid="tooltip-content-for-dock-tab-close-for-terminal"
+                      >
                         Close ⌘+W
                       </div>
                     </div>
diff --git a/src/renderer/frames/cluster-frame/cluster-frame-component-registrator.injectable.ts b/src/renderer/frames/cluster-frame/cluster-frame-component-registrator.injectable.ts
new file mode 100644
index 0000000000..31a2db819d
--- /dev/null
+++ b/src/renderer/frames/cluster-frame/cluster-frame-component-registrator.injectable.ts
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { pipeline } from "@ogre-tools/fp";
+import { getInjectable } from "@ogre-tools/injectable";
+import { map } from "lodash/fp";
+import { extensionRegistratorInjectionToken } from "../../../extensions/extension-loader/extension-registrator-injection-token";
+import type { ExtensionRegistrator } from "../../../extensions/extension-loader/extension-registrator-injection-token";
+import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension";
+import { clusterFrameChildComponentInjectionToken } from "./cluster-frame-child-component-injection-token";
+
+const clusterFrameComponentRegistratorInjectable = getInjectable({
+  id: "cluster-frame-component-registrator",
+
+  instantiate: (): ExtensionRegistrator => {
+    return (ext) => {
+      const extension = ext as LensRendererExtension;
+
+      return pipeline(
+        extension.clusterFrameComponents,
+
+        map((clusterFrameComponentRegistration) => {
+          const id = `${extension.sanitizedExtensionId}-${clusterFrameComponentRegistration.id}`;
+
+          return getInjectable({
+            id,
+            injectionToken: clusterFrameChildComponentInjectionToken,
+            instantiate: () => ({
+              id,
+              shouldRender: clusterFrameComponentRegistration.shouldRender,
+              Component: clusterFrameComponentRegistration.Component,
+            }),
+          });
+        }),
+      );
+    };
+  },
+  injectionToken: extensionRegistratorInjectionToken,
+});
+
+export default clusterFrameComponentRegistratorInjectable;
diff --git a/src/renderer/frames/cluster-frame/cluster-frame.test.tsx b/src/renderer/frames/cluster-frame/cluster-frame.test.tsx
index 5ec0d0894f..bee7d3a415 100644
--- a/src/renderer/frames/cluster-frame/cluster-frame.test.tsx
+++ b/src/renderer/frames/cluster-frame/cluster-frame.test.tsx
@@ -24,6 +24,7 @@ import currentRouteComponentInjectable from "../../routes/current-route-componen
 import allowedResourcesInjectable from "../../cluster-frame-context/allowed-resources.injectable";
 import hostedClusterIdInjectable from "../../cluster-frame-context/hosted-cluster-id.injectable";
 import hostedClusterInjectable from "../../cluster-frame-context/hosted-cluster.injectable";
+import { useFakeTime } from "../../../common/test-utils/use-fake-time";
 
 describe("<ClusterFrame />", () => {
   let render: () => RenderResult;
@@ -45,6 +46,8 @@ describe("<ClusterFrame />", () => {
     di.override(directoryForUserDataInjectable, () => "/some/irrelavent/path");
     di.override(storesAndApisCanBeCreatedInjectable, () => true);
 
+    useFakeTime("2000-01-01 12:00:00am");
+
     const createCluster = di.inject(createClusterInjectable);
 
     cluster = createCluster(
diff --git a/src/renderer/frames/cluster-frame/cluster-frame.tsx b/src/renderer/frames/cluster-frame/cluster-frame.tsx
index d1ce64683f..8b88be3564 100755
--- a/src/renderer/frames/cluster-frame/cluster-frame.tsx
+++ b/src/renderer/frames/cluster-frame/cluster-frame.tsx
@@ -14,11 +14,13 @@ import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.inj
 import type { ClusterFrameChildComponent } from "./cluster-frame-child-component-injection-token";
 import { clusterFrameChildComponentInjectionToken } from "./cluster-frame-child-component-injection-token";
 import watchHistoryStateInjectable from "../../remote-helpers/watch-history-state.injectable";
+import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
+import type { IComputedValue } from "mobx";
 
 interface Dependencies {
   namespaceStore: NamespaceStore;
   subscribeStores: SubscribeStores;
-  childComponents: ClusterFrameChildComponent[];
+  childComponents: IComputedValue<ClusterFrameChildComponent[]>;
   watchHistoryState: () => () => void;
 }
 
@@ -37,7 +39,7 @@ export const NonInjectedClusterFrame = observer(({
 
   return (
     <ErrorBoundary>
-      {childComponents
+      {childComponents.get()
         .map((child) => (
           <Observer key={child.id}>
             {() => (child.shouldRender.get() ? <child.Component /> : null) }
@@ -48,12 +50,16 @@ export const NonInjectedClusterFrame = observer(({
 });
 
 export const ClusterFrame = withInjectables<Dependencies>(NonInjectedClusterFrame, {
-  getProps: di => ({
-    namespaceStore: di.inject(namespaceStoreInjectable),
-    subscribeStores: di.inject(subscribeStoresInjectable),
-    childComponents: di.injectMany(clusterFrameChildComponentInjectionToken),
-    watchHistoryState: di.inject(watchHistoryStateInjectable),
-  }),
+  getProps: di => {
+    const computedInjectMany = di.inject(computedInjectManyInjectable);
+
+    return {
+      namespaceStore: di.inject(namespaceStoreInjectable),
+      subscribeStores: di.inject(subscribeStoresInjectable),
+      childComponents: computedInjectMany(clusterFrameChildComponentInjectionToken),
+      watchHistoryState: di.inject(watchHistoryStateInjectable),
+    };
+  },
 });
 
 ClusterFrame.displayName = "ClusterFrame";
diff --git a/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts b/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts
index 9dd4f59702..93f3f4c7dc 100644
--- a/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts
+++ b/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts
@@ -8,9 +8,9 @@ import extensionLoaderInjectable from "../../../../extensions/extension-loader/e
 import catalogEntityRegistryInjectable from "../../../api/catalog/entity/registry.injectable";
 import frameRoutingIdInjectable from "./frame-routing-id/frame-routing-id.injectable";
 import hostedClusterInjectable from "../../../cluster-frame-context/hosted-cluster.injectable";
-import appEventBusInjectable from "../../../../common/app-event-bus/app-event-bus.injectable";
 import clusterFrameContextInjectable from "../../../cluster-frame-context/cluster-frame-context.injectable";
 import assert from "assert";
+import emitAppEventInjectable from "../../../../common/app-event-bus/emit-event.injectable";
 
 const initClusterFrameInjectable = getInjectable({
   id: "init-cluster-frame",
@@ -25,7 +25,7 @@ const initClusterFrameInjectable = getInjectable({
       loadExtensions: di.inject(extensionLoaderInjectable).loadOnClusterRenderer,
       catalogEntityRegistry: di.inject(catalogEntityRegistryInjectable),
       frameRoutingId: di.inject(frameRoutingIdInjectable),
-      emitEvent: di.inject(appEventBusInjectable).emit,
+      emitAppEvent: di.inject(emitAppEventInjectable),
       clusterFrameContext: di.inject(clusterFrameContextInjectable),
     });
   },
diff --git a/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.ts b/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.ts
index 6d1303e256..6c7dec4b40 100644
--- a/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.ts
+++ b/src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.ts
@@ -7,19 +7,19 @@ import type { CatalogEntityRegistry } from "../../../api/catalog/entity/registry
 import logger from "../../../../main/logger";
 import type { KubernetesCluster } from "../../../../common/catalog-entities";
 import { Notifications } from "../../../components/notifications";
-import type { AppEvent } from "../../../../common/app-event-bus/event-bus";
 import type { CatalogEntity } from "../../../../common/catalog";
 import { when } from "mobx";
 import type { ClusterFrameContext } from "../../../cluster-frame-context/cluster-frame-context";
 import { KubeObjectStore } from "../../../../common/k8s-api/kube-object.store";
 import { requestSetClusterFrameId } from "../../../ipc";
+import type { EmitAppEvent } from "../../../../common/app-event-bus/emit-event.injectable";
 
 interface Dependencies {
   hostedCluster: Cluster;
   loadExtensions: (getCluster: () => CatalogEntity) => void;
   catalogEntityRegistry: CatalogEntityRegistry;
   frameRoutingId: number;
-  emitEvent: (event: AppEvent) => void;
+  emitAppEvent: EmitAppEvent;
 
   // TODO: This dependency belongs to KubeObjectStore
   clusterFrameContext: ClusterFrameContext;
@@ -32,7 +32,7 @@ export const initClusterFrame = ({
   loadExtensions,
   catalogEntityRegistry,
   frameRoutingId,
-  emitEvent,
+  emitAppEvent,
   clusterFrameContext,
 }: Dependencies) =>
   async (unmountRoot: () => void) => {
@@ -70,7 +70,7 @@ export const initClusterFrame = ({
     );
 
     setTimeout(() => {
-      emitEvent({
+      emitAppEvent({
         name: "cluster",
         action: "open",
         params: {
diff --git a/src/renderer/frames/root-frame/broadcast-that-root-frame-is-rendered.injectable.ts b/src/renderer/frames/root-frame/broadcast-that-root-frame-is-rendered.injectable.ts
index e6493e2832..841d19e002 100644
--- a/src/renderer/frames/root-frame/broadcast-that-root-frame-is-rendered.injectable.ts
+++ b/src/renderer/frames/root-frame/broadcast-that-root-frame-is-rendered.injectable.ts
@@ -3,18 +3,17 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { messageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
-import rootFrameIsRenderedChannelInjectable from "../../../common/root-frame-rendered-channel/root-frame-rendered-channel.injectable";
+import { sendMessageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
+import { rootFrameHasRenderedChannel } from "../../../common/root-frame/root-frame-rendered-channel";
 
 const broadcastThatRootFrameIsRenderedInjectable = getInjectable({
   id: "broadcast-that-root-frame-is-rendered",
 
   instantiate: (di) => {
-    const messageToChannel = di.inject(messageToChannelInjectionToken);
-    const rootFrameIsRenderedChannel = di.inject(rootFrameIsRenderedChannelInjectable);
+    const messageToChannel = di.inject(sendMessageToChannelInjectionToken);
 
     return () => {
-      messageToChannel(rootFrameIsRenderedChannel);
+      messageToChannel(rootFrameHasRenderedChannel);
     };
   },
 });
diff --git a/src/renderer/frames/root-frame/setup-system-ca.injectable.ts b/src/renderer/frames/root-frame/setup-system-ca.injectable.ts
index ca913a4371..cc8a0bafcc 100644
--- a/src/renderer/frames/root-frame/setup-system-ca.injectable.ts
+++ b/src/renderer/frames/root-frame/setup-system-ca.injectable.ts
@@ -2,21 +2,16 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { injectSystemCAs } from "../../../common/system-ca";
 import { getInjectable } from "@ogre-tools/injectable";
 import { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token";
+import injectSystemCAsInjectable from "../../../common/certificate-authorities/inject-system-cas.injectable";
 
 const setupSystemCaInjectable = getInjectable({
   id: "setup-system-ca",
-
-  instantiate: () => ({
-    run: async () => {
-      await injectSystemCAs();
-    },
+  instantiate: (di) => ({
+    id: "setup-system-ca",
+    run: di.inject(injectSystemCAsInjectable),
   }),
-
-  causesSideEffects: true,
-
   injectionToken: beforeFrameStartsInjectionToken,
 });
 
diff --git a/src/renderer/getDi.tsx b/src/renderer/getDi.tsx
index 348c5e369b..28e111bc97 100644
--- a/src/renderer/getDi.tsx
+++ b/src/renderer/getDi.tsx
@@ -20,10 +20,10 @@ export const getDi = () => {
     autoRegister({
       di,
       requireContexts: [
-        require.context("./", true, /\.injectable\.(ts|tsx)$/),
-        require.context("../common", true, /\.injectable\.(ts|tsx)$/),
-        require.context("../extensions", true, /\.injectable\.(ts|tsx)$/),
-        require.context("../features", true, /.*\/(renderer|common)\/.*\.injectable\.(ts|tsx)$/),
+        require.context("./", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
+        require.context("../common", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
+        require.context("../extensions", true, CONTEXT_MATCHER_FOR_NON_FEATURES),
+        require.context("../features", true, CONTEXT_MATCHER_FOR_FEATURES),
       ],
     });
   });
diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx
index 469de713b0..8f9e72c167 100644
--- a/src/renderer/getDiForUnitTesting.tsx
+++ b/src/renderer/getDiForUnitTesting.tsx
@@ -5,9 +5,7 @@
 
 import { noop, chunk } from "lodash/fp";
 import type { DiContainer, Injectable } from "@ogre-tools/injectable";
-import {
-  createContainer,
-} from "@ogre-tools/injectable";
+import { createContainer, isInjectable } from "@ogre-tools/injectable";
 import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import requestFromChannelInjectable from "./utils/channel/request-from-channel.injectable";
 import loggerInjectable from "../common/logger.injectable";
@@ -20,10 +18,6 @@ import fileSystemProvisionerStoreInjectable from "../extensions/extension-loader
 import type { FileSystemProvisionerStore } from "../extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store";
 import userStoreInjectable from "../common/user-store/user-store.injectable";
 import type { UserStore } from "../common/user-store";
-import getAbsolutePathInjectable from "../common/path/get-absolute-path.injectable";
-import { getAbsolutePathFake } from "../common/test-utils/get-absolute-path-fake";
-import joinPathsInjectable from "../common/path/join-paths.injectable";
-import { joinPathsFake } from "../common/test-utils/join-paths-fake";
 import hotbarStoreInjectable from "../common/hotbars/store.injectable";
 import terminalSpawningPoolInjectable from "./components/dock/terminal/terminal-spawning-pool.injectable";
 import hostedClusterIdInjectable from "./cluster-frame-context/hosted-cluster-id.injectable";
@@ -32,41 +26,32 @@ import { ApiManager } from "../common/k8s-api/api-manager";
 import lensResourcesDirInjectable from "../common/vars/lens-resources-dir.injectable";
 import broadcastMessageInjectable from "../common/ipc/broadcast-message.injectable";
 import apiManagerInjectable from "../common/k8s-api/api-manager/manager.injectable";
-import setupOnApiErrorListenersInjectable from "./api/setup-on-api-errors.injectable";
 import { observable, computed, runInAction } from "mobx";
-import defaultShellInjectable from "./components/+preferences/default-shell.injectable";
-import appVersionInjectable from "../common/vars/app-version.injectable";
 import requestAnimationFrameInjectable from "./components/animate/request-animation-frame.injectable";
 import getRandomIdInjectable from "../common/utils/get-random-id.injectable";
-import getFilePathsInjectable from "./components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable";
-import callForPublicHelmRepositoriesInjectable from "./components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
+import getFilePathsInjectable from "../features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable";
+import callForPublicHelmRepositoriesInjectable from "../features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
 import platformInjectable from "../common/vars/platform.injectable";
 import startTopbarStateSyncInjectable from "./components/layout/top-bar/start-state-sync.injectable";
 import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
 import watchHistoryStateInjectable from "./remote-helpers/watch-history-state.injectable";
-import openAppContextMenuInjectable from "./components/layout/top-bar/open-app-context-menu.injectable";
-import goBackInjectable from "./components/layout/top-bar/go-back.injectable";
-import goForwardInjectable from "./components/layout/top-bar/go-forward.injectable";
-import closeWindowInjectable from "./components/layout/top-bar/close-window.injectable";
-import maximizeWindowInjectable from "./components/layout/top-bar/maximize-window.injectable";
-import toggleMaximizeWindowInjectable from "./components/layout/top-bar/toggle-maximize-window.injectable";
 import type { HotbarStore } from "../common/hotbars/store";
 import cronJobTriggerDialogClusterFrameChildComponentInjectable from "./components/+workloads-cronjobs/cron-job-trigger-dialog-cluster-frame-child-component.injectable";
 import deploymentScaleDialogClusterFrameChildComponentInjectable from "./components/+workloads-deployments/scale/deployment-scale-dialog-cluster-frame-child-component.injectable";
 import replicasetScaleDialogClusterFrameChildComponentInjectable from "./components/+workloads-replicasets/scale-dialog/replicaset-scale-dialog-cluster-frame-child-component.injectable";
 import statefulsetScaleDialogClusterFrameChildComponentInjectable from "./components/+workloads-statefulsets/scale/statefulset-scale-dialog-cluster-frame-child-component.injectable";
-import deleteClusterDialogClusterFrameChildComponentInjectable from "./components/delete-cluster-dialog/delete-cluster-dialog-cluster-frame-child-component.injectable";
 import kubeObjectDetailsClusterFrameChildComponentInjectable from "./components/kube-object-details/kube-object-details-cluster-frame-child-component.injectable";
 import kubeconfigDialogClusterFrameChildComponentInjectable from "./components/kubeconfig-dialog/kubeconfig-dialog-cluster-frame-child-component.injectable";
 import portForwardDialogClusterFrameChildComponentInjectable from "./port-forward/port-forward-dialog-cluster-frame-child-component.injectable";
 import setupSystemCaInjectable from "./frames/root-frame/setup-system-ca.injectable";
 import extensionShouldBeEnabledForClusterFrameInjectable from "./extension-loader/extension-should-be-enabled-for-cluster-frame.injectable";
 import { asyncComputed } from "@ogre-tools/injectable-react";
-import forceUpdateModalRootFrameComponentInjectable from "./application-update/force-update-modal/force-update-modal-root-frame-component.injectable";
 import legacyOnChannelListenInjectable from "./ipc/legacy-channel-listen.injectable";
 import getEntitySettingCommandsInjectable from "./components/command-palette/registered-commands/get-entity-setting-commands.injectable";
 import storageSaveDelayInjectable from "./utils/create-storage/storage-save-delay.injectable";
+import environmentVariablesInjectable from "../common/utils/environment-variables.injectable";
 import type { GlobalOverride } from "../common/test-utils/get-global-override";
+import type { PartialDeep } from "type-fest";
 
 export const getDiForUnitTesting = (
   opts: { doGeneralOverrides?: boolean } = {},
@@ -80,9 +65,11 @@ export const getDiForUnitTesting = (
   setLegacyGlobalDiForExtensionApi(di, Environments.renderer);
 
   const injectables: Injectable<any, any, any>[] = (
-      global as any
-  ).rendererInjectablePaths.map(
-    (filePath: string) => require(filePath).default,
+    global as any
+  ).rendererInjectablePaths.flatMap((filePath: string) =>
+    Object.values(require(filePath)).filter(
+      (maybeInjectable: any) => isInjectable(maybeInjectable),
+    ),
   );
 
   runInAction(() => {
@@ -104,18 +91,20 @@ export const getDiForUnitTesting = (
 
     di.override(getRandomIdInjectable, () => () => "some-irrelevant-random-id");
     di.override(platformInjectable, () => "darwin");
-    di.override(startTopbarStateSyncInjectable, () => ({
-      run: () => {},
-    }));
+
+    [
+      startTopbarStateSyncInjectable,
+      setupSystemCaInjectable,
+    ].forEach((injectable) => {
+      di.override(injectable, () => ({
+        id: injectable.id,
+        run: () => {},
+      }));
+    });
 
     di.override(terminalSpawningPoolInjectable, () => document.createElement("div"));
     di.override(hostedClusterIdInjectable, () => undefined);
 
-    di.override(getAbsolutePathInjectable, () => getAbsolutePathFake);
-    di.override(joinPathsInjectable, () => joinPathsFake);
-
-    di.override(appVersionInjectable, () => "1.0.0");
-
     di.override(historyInjectable, () => createMemoryHistory());
     di.override(legacyOnChannelListenInjectable, () => () => noop);
 
@@ -127,15 +116,9 @@ export const getDiForUnitTesting = (
     // TODO: remove when entity settings registry is refactored
     di.override(getEntitySettingCommandsInjectable, () => () => []);
 
-    di.override(forceUpdateModalRootFrameComponentInjectable, () => ({
-      id: "force-update-modal",
-      Component: () => null,
-      shouldRender: computed(() => false),
-    }));
-
     // TODO: Remove after "LensRendererExtension.isEnabledForCluster" is removed
     di.override(extensionShouldBeEnabledForClusterFrameInjectable, () =>
-      asyncComputed(async () => true, true),
+      asyncComputed({ getValueFromObservedPromise: async () => true, valueWhenPending: true }),
     );
 
     // TODO: Remove side-effects and shared global state
@@ -144,7 +127,6 @@ export const getDiForUnitTesting = (
       deploymentScaleDialogClusterFrameChildComponentInjectable,
       replicasetScaleDialogClusterFrameChildComponentInjectable,
       statefulsetScaleDialogClusterFrameChildComponentInjectable,
-      deleteClusterDialogClusterFrameChildComponentInjectable,
       kubeObjectDetailsClusterFrameChildComponentInjectable,
       kubeconfigDialogClusterFrameChildComponentInjectable,
       portForwardDialogClusterFrameChildComponentInjectable,
@@ -158,13 +140,8 @@ export const getDiForUnitTesting = (
       }));
     });
 
+    di.override(environmentVariablesInjectable, () => ({}));
     di.override(watchHistoryStateInjectable, () => () => () => {});
-    di.override(openAppContextMenuInjectable, () => () => {});
-    di.override(goBackInjectable, () => () => {});
-    di.override(goForwardInjectable, () => () => {});
-    di.override(closeWindowInjectable, () => () => {});
-    di.override(maximizeWindowInjectable, () => () => {});
-    di.override(toggleMaximizeWindowInjectable, () => () => {});
 
     overrideFunctionalInjectables(di, [
       broadcastMessageInjectable,
@@ -182,22 +159,14 @@ export const getDiForUnitTesting = (
 
     di.override(fileSystemProvisionerStoreInjectable, () => ({}) as FileSystemProvisionerStore);
 
-    di.override(setupSystemCaInjectable, () => ({ run: () => {} }));
-    di.override(setupOnApiErrorListenersInjectable, () => ({ run: () => {} }));
-
-    di.override(defaultShellInjectable, () => "some-default-shell");
-
-    di.override(
-      userStoreInjectable,
-      () =>
-        ({
-          isTableColumnHidden: () => false,
-          extensionRegistryUrl: { customUrl: "some-custom-url" },
-          syncKubeconfigEntries: observable.map(),
-          terminalConfig: { fontSize: 42 },
-          editorConfiguration: { minimap: {}, tabSize: 42, fontSize: 42 },
-        } as unknown as UserStore),
-    );
+    di.override(userStoreInjectable, () => ({
+      isTableColumnHidden: () => false,
+      extensionRegistryUrl: { customUrl: "some-custom-url" },
+      syncKubeconfigEntries: observable.map(),
+      terminalConfig: { fontSize: 42 },
+      editorConfiguration: { minimap: {}, tabSize: 42, fontSize: 42 },
+      load: () => {},
+    } as PartialDeep<UserStore> as UserStore));
 
     di.override(apiManagerInjectable, () => new ApiManager());
 
diff --git a/src/renderer/initializers/add-sync-entries.injectable.tsx b/src/renderer/initializers/add-sync-entries.injectable.tsx
index 493ac02598..b0dc7b2b86 100644
--- a/src/renderer/initializers/add-sync-entries.injectable.tsx
+++ b/src/renderer/initializers/add-sync-entries.injectable.tsx
@@ -2,12 +2,12 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getAllEntries } from "../components/+preferences/kubeconfig-syncs";
+import { getAllEntries } from "../../features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync";
 import { Notifications } from "../components/notifications";
 import { getInjectable } from "@ogre-tools/injectable";
 import userStoreInjectable from "../../common/user-store/user-store.injectable";
 import React from "react";
-import navigateToKubernetesPreferencesInjectable from "../../common/front-end-routing/routes/preferences/kubernetes/navigate-to-kubernetes-preferences.injectable";
+import navigateToKubernetesPreferencesInjectable from "../../features/preferences/common/navigate-to-kubernetes-preferences.injectable";
 import loggerInjectable from "../../common/logger.injectable";
 
 const addSyncEntriesInjectable = getInjectable({
diff --git a/src/renderer/ipc/index.ts b/src/renderer/ipc/index.ts
index 48a005d536..e9407a1af5 100644
--- a/src/renderer/ipc/index.ts
+++ b/src/renderer/ipc/index.ts
@@ -4,7 +4,7 @@
  */
 
 import type { OpenDialogOptions } from "electron";
-import { clusterActivateHandler, clusterClearDeletingHandler, clusterDeleteHandler, clusterDisconnectHandler, clusterKubectlApplyAllHandler, clusterKubectlDeleteAllHandler, clusterSetDeletingHandler, clusterSetFrameIdHandler, clusterStates } from "../../common/ipc/cluster";
+import { clusterActivateHandler, clusterDisconnectHandler, clusterSetFrameIdHandler, clusterStates } from "../../common/ipc/cluster";
 import type { ClusterId, ClusterState } from "../../common/cluster-types";
 import { windowActionHandleChannel, windowLocationChangedChannel, windowOpenAppMenuAsContextMenuChannel, type WindowAction } from "../../common/ipc/window";
 import { openFilePickingDialogChannel } from "../../common/ipc/dialog";
@@ -60,30 +60,10 @@ export function requestClusterDisconnection(clusterId: ClusterId, force?: boolea
   return requestMain(clusterDisconnectHandler, clusterId, force);
 }
 
-export function requestSetClusterAsDeleting(clusterId: ClusterId): Promise<void> {
-  return requestMain(clusterSetDeletingHandler, clusterId);
-}
-
-export function requestClearClusterAsDeleting(clusterId: ClusterId): Promise<void> {
-  return requestMain(clusterClearDeletingHandler, clusterId);
-}
-
-export function requestDeleteCluster(clusterId: ClusterId): Promise<void> {
-  return requestMain(clusterDeleteHandler, clusterId);
-}
-
 export function requestInitialClusterStates(): Promise<{ id: string; state: ClusterState }[]> {
   return requestMain(clusterStates);
 }
 
-export function requestKubectlApplyAll(clusterId: ClusterId, resources: string[], kubectlArgs: string[]): Promise<{ stderr?: string; stdout?: string }> {
-  return requestMain(clusterKubectlApplyAllHandler, clusterId, resources, kubectlArgs);
-}
-
-export function requestKubectlDeleteAll(clusterId: ClusterId, resources: string[], kubectlArgs: string[]): Promise<{ stderr?: string; stdout?: string }> {
-  return requestMain(clusterKubectlDeleteAllHandler, clusterId, resources, kubectlArgs);
-}
-
 export function requestInitialExtensionDiscovery(): Promise<{ isLoaded: boolean }> {
   return requestMain(extensionDiscoveryStateChannel);
 }
diff --git a/src/renderer/ipc/list-namespaces-forbidden-handler.injectable.tsx b/src/renderer/ipc/list-namespaces-forbidden-handler.injectable.tsx
index 22434df1b6..6ee14d7857 100644
--- a/src/renderer/ipc/list-namespaces-forbidden-handler.injectable.tsx
+++ b/src/renderer/ipc/list-namespaces-forbidden-handler.injectable.tsx
@@ -11,6 +11,7 @@ import { Button } from "../components/button";
 import type { IpcRendererEvent } from "electron";
 import React from "react";
 import notificationsStoreInjectable from "../components/notifications/notifications-store.injectable";
+import { getMillisecondsFromUnixEpoch } from "../../common/utils/date/get-current-date-time";
 
 const listNamespacesForbiddenHandlerInjectable = getInjectable({
   id: "list-namespaces-forbidden-handler",
@@ -18,7 +19,6 @@ const listNamespacesForbiddenHandlerInjectable = getInjectable({
   instantiate: (di) => {
     const navigateToEntitySettings = di.inject(navigateToEntitySettingsInjectable);
     const notificationsStore = di.inject(notificationsStoreInjectable);
-
     const notificationLastDisplayedAt = new Map<string, number>();
     const intervalBetweenNotifications = 1000 * 60; // 60s
 
@@ -27,7 +27,7 @@ const listNamespacesForbiddenHandlerInjectable = getInjectable({
       ...[clusterId]: ListNamespaceForbiddenArgs
     ): void => {
       const lastDisplayedAt = notificationLastDisplayedAt.get(clusterId);
-      const now = Date.now();
+      const now = getMillisecondsFromUnixEpoch();
 
       if (
         typeof lastDisplayedAt !== "number" ||
@@ -74,7 +74,7 @@ const listNamespacesForbiddenHandlerInjectable = getInjectable({
        * Set the time when the notification is closed as well so that there is at
        * least a minute between closing the notification as seeing it again
        */
-          onClose: () => notificationLastDisplayedAt.set(clusterId, Date.now()),
+          onClose: () => notificationLastDisplayedAt.set(clusterId, getMillisecondsFromUnixEpoch()),
         },
       );
     };
diff --git a/src/renderer/ipc/register-listeners.tsx b/src/renderer/ipc/register-listeners.tsx
index 4d2ed9f5c8..c7b447c334 100644
--- a/src/renderer/ipc/register-listeners.tsx
+++ b/src/renderer/ipc/register-listeners.tsx
@@ -5,10 +5,9 @@
 
 import type { IpcRendererEvent } from "electron";
 import { ipcRenderer } from "electron";
-import { onCorrect } from "../../common/ipc";
 import { Notifications } from "../components/notifications";
 import { defaultHotbarCells } from "../../common/hotbars/types";
-import { type ListNamespaceForbiddenArgs, clusterListNamespaceForbiddenChannel, isListNamespaceForbiddenArgs } from "../../common/ipc/cluster";
+import { type ListNamespaceForbiddenArgs, clusterListNamespaceForbiddenChannel } from "../../common/ipc/cluster";
 import { hotbarTooManyItemsChannel } from "../../common/ipc/hotbar";
 
 function HotbarTooManyItemsHandler(): void {
@@ -23,15 +22,6 @@ interface Dependencies {
 }
 
 export const registerIpcListeners = ({ listNamespacesForbiddenHandler }: Dependencies) => () => {
-  onCorrect({
-    source: ipcRenderer,
-    channel: clusterListNamespaceForbiddenChannel,
-    listener: listNamespacesForbiddenHandler,
-    verifier: isListNamespaceForbiddenArgs,
-  });
-  onCorrect({
-    source: ipcRenderer,
-    channel: hotbarTooManyItemsChannel,
-    listener: HotbarTooManyItemsHandler,
-    verifier: (args: unknown[]): args is [] => args.length === 0,
-  });};
+  ipcRenderer.on(clusterListNamespaceForbiddenChannel, listNamespacesForbiddenHandler);
+  ipcRenderer.on(hotbarTooManyItemsChannel, HotbarTooManyItemsHandler);
+};
diff --git a/src/renderer/k8s/api-base.injectable.ts b/src/renderer/k8s/api-base.injectable.ts
new file mode 100644
index 0000000000..9ce5ab5f98
--- /dev/null
+++ b/src/renderer/k8s/api-base.injectable.ts
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { apiBaseInjectionToken } from "../../common/k8s-api/api-base";
+import createJsonApiInjectable from "../../common/k8s-api/create-json-api.injectable";
+import windowLocationInjectable from "../../common/k8s-api/window-location.injectable";
+import { apiPrefix } from "../../common/vars";
+import isDebuggingInjectable from "../../common/vars/is-debugging.injectable";
+import isDevelopmentInjectable from "../../common/vars/is-development.injectable";
+
+const apiBaseInjectable = getInjectable({
+  id: "api-base",
+  instantiate: (di) => {
+    const createJsonApi = di.inject(createJsonApiInjectable);
+    const isDebugging = di.inject(isDebuggingInjectable);
+    const { port, host } = di.inject(windowLocationInjectable);
+
+    return createJsonApi(
+      {
+        serverAddress: `http://127.0.0.1:${port}`,
+        apiBase: apiPrefix,
+        debug: di.inject(isDevelopmentInjectable) || isDebugging,
+      },
+      {
+        headers: {
+          "Host": host,
+        },
+      },
+    );
+  },
+  injectionToken: apiBaseInjectionToken,
+});
+
+export default apiBaseInjectable;
diff --git a/src/renderer/k8s/api-kube.injectable.ts b/src/renderer/k8s/api-kube.injectable.ts
index f617a10ce6..c7c87194a5 100644
--- a/src/renderer/k8s/api-kube.injectable.ts
+++ b/src/renderer/k8s/api-kube.injectable.ts
@@ -4,28 +4,41 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
-import { onApiError } from "../api/on-api-error";
-import { apiKubePrefix, isDevelopment } from "../../common/vars";
+import { apiKubePrefix } from "../../common/vars";
 import { apiKubeInjectionToken } from "../../common/k8s-api/api-kube";
 import { storesAndApisCanBeCreatedInjectionToken } from "../../common/k8s-api/stores-apis-can-be-created.token";
-import { KubeJsonApi } from "../../common/k8s-api/kube-json-api";
+import createKubeJsonApiInjectable from "../../common/k8s-api/create-kube-json-api.injectable";
+import isDevelopmentInjectable from "../../common/vars/is-development.injectable";
+import showErrorNotificationInjectable from "../components/notifications/show-error-notification.injectable";
+import windowLocationInjectable from "../../common/k8s-api/window-location.injectable";
 
 const apiKubeInjectable = getInjectable({
   id: "api-kube",
   instantiate: (di) => {
     assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "apiKube is only available in certain environments");
+    const createKubeJsonApi = di.inject(createKubeJsonApiInjectable);
+    const isDevelopment = di.inject(isDevelopmentInjectable);
+    const showErrorNotification = di.inject(showErrorNotificationInjectable);
+    const { port, host } = di.inject(windowLocationInjectable);
 
-    const apiKube = new KubeJsonApi({
-      serverAddress: `http://127.0.0.1:${window.location.port}`,
+    const apiKube = createKubeJsonApi({
+      serverAddress: `http://127.0.0.1:${port}`,
       apiBase: apiKubePrefix,
       debug: isDevelopment,
     }, {
       headers: {
-        "Host": window.location.host,
+        "Host": host,
       },
     });
 
-    apiKube.onError.addListener(onApiError);
+    apiKube.onError.addListener((error, res) => {
+      switch (res.status) {
+        case 403:
+          error.isUsedForNotification = true;
+          showErrorNotification(error);
+          break;
+      }
+    });
 
     return apiKube;
   },
diff --git a/src/renderer/kube-watch-api/kube-watch-api.ts b/src/renderer/kube-watch-api/kube-watch-api.ts
index 95c0442fcb..c3eca74d29 100644
--- a/src/renderer/kube-watch-api/kube-watch-api.ts
+++ b/src/renderer/kube-watch-api/kube-watch-api.ts
@@ -107,7 +107,7 @@ export class KubeWatchApi {
         unsubscribe.push(store.subscribe({ onLoadFailure, abortController: childController }));
       } catch (error) {
         if (!(error instanceof DOMException)) {
-          this.log(Object.assign(new Error("Loading stores has failed"), { cause: error }), {
+          this.log(new Error("Loading stores has failed", { cause: error }), {
             meta: { store, namespaces },
           });
         }
diff --git a/src/renderer/kubectl/apply-all.injectable.ts b/src/renderer/kubectl/apply-all.injectable.ts
new file mode 100644
index 0000000000..989017f9d9
--- /dev/null
+++ b/src/renderer/kubectl/apply-all.injectable.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { kubectlApplyAllChannel, kubectlApplyAllInjectionToken } from "../../common/kube-helpers/channels";
+import requestFromChannelInjectable from "../utils/channel/request-from-channel.injectable";
+
+const kubectlApplyAllInjectable = getInjectable({
+  id: "kubectl-apply-all",
+  instantiate: (di) => {
+    const requestFromChannel = di.inject(requestFromChannelInjectable);
+
+    return (req) => requestFromChannel(kubectlApplyAllChannel, req);
+  },
+  injectionToken: kubectlApplyAllInjectionToken,
+});
+
+export default kubectlApplyAllInjectable;
diff --git a/src/renderer/kubectl/delete-all.injectable.ts b/src/renderer/kubectl/delete-all.injectable.ts
new file mode 100644
index 0000000000..586895c75c
--- /dev/null
+++ b/src/renderer/kubectl/delete-all.injectable.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { kubectlDeleteAllChannel, kubectlDeleteAllInjectionToken } from "../../common/kube-helpers/channels";
+import requestFromChannelInjectable from "../utils/channel/request-from-channel.injectable";
+
+const kubectlDeleteAllInjectable = getInjectable({
+  id: "kubectl-delete-all",
+  instantiate: (di) => {
+    const requestFromChannel = di.inject(requestFromChannelInjectable);
+
+    return (req) => requestFromChannel(kubectlDeleteAllChannel, req);
+  },
+  injectionToken: kubectlDeleteAllInjectionToken,
+});
+
+export default kubectlDeleteAllInjectable;
diff --git a/src/renderer/logger/browser-transport.injectable.ts b/src/renderer/logger/browser-transport.injectable.ts
new file mode 100644
index 0000000000..5a38c5a396
--- /dev/null
+++ b/src/renderer/logger/browser-transport.injectable.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import BrowserConsole from "winston-transport-browserconsole";
+import { loggerTransportInjectionToken } from "../../common/logger/transports";
+
+const browserLoggerTransportInjectable = getInjectable({
+  id: "browser-logger-transport",
+  instantiate: () => new BrowserConsole(),
+  injectionToken: loggerTransportInjectionToken,
+});
+
+export default browserLoggerTransportInjectable;
diff --git a/src/renderer/navigation/events.ts b/src/renderer/navigation/events.ts
index 35021e1d72..7cacd1b313 100644
--- a/src/renderer/navigation/events.ts
+++ b/src/renderer/navigation/events.ts
@@ -5,14 +5,11 @@
 
 import { ipcRenderer } from "electron";
 import { reaction } from "mobx";
-import { broadcastMessage, ipcRendererOn } from "../../common/ipc";
-import {
-  getLegacyGlobalDiForExtensionApi,
-} from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
+import { broadcastMessage } from "../../common/ipc";
+import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import matchedClusterIdInjectable from "./matched-cluster-id.injectable";
 
 export const enum IpcRendererNavigationEvents {
-  RELOAD_PAGE = "renderer:page-reload",
   CLUSTER_VIEW_CURRENT_ID = "renderer:cluster-id-of-active-view",
   NAVIGATE_IN_APP = "renderer:navigate",
   NAVIGATE_IN_CLUSTER = "renderer:navigate-in-cluster",
@@ -27,11 +24,6 @@ export function bindEvents() {
   if (process.isMainFrame) {
     bindClusterManagerRouteEvents();
   }
-
-  // Reload dashboard window
-  ipcRendererOn(IpcRendererNavigationEvents.RELOAD_PAGE, () => {
-    location.reload();
-  });
 }
 
 // Handle events only in main window renderer process (see also: cluster-manager.tsx)
diff --git a/src/renderer/navigation/navigation-channel-listener.injectable.ts b/src/renderer/navigation/navigation-channel-listener.injectable.ts
index 3a17451071..1b33b4fe2c 100644
--- a/src/renderer/navigation/navigation-channel-listener.injectable.ts
+++ b/src/renderer/navigation/navigation-channel-listener.injectable.ts
@@ -2,12 +2,14 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
+import type { InjectionToken } from "@ogre-tools/injectable";
 import { getInjectable } from "@ogre-tools/injectable";
 import currentlyInClusterFrameInjectable from "../routes/currently-in-cluster-frame.injectable";
-import appNavigationChannelInjectable from "../../common/front-end-routing/app-navigation-channel.injectable";
-import clusterFrameNavigationChannelInjectable from "../../common/front-end-routing/cluster-frame-navigation-channel.injectable";
+import { appNavigationChannel } from "../../common/front-end-routing/app-navigation-channel";
+import { clusterFrameNavigationChannel } from "../../common/front-end-routing/cluster-frame-navigation-channel";
 import focusWindowInjectable from "./focus-window.injectable";
 import { navigateToUrlInjectionToken } from "../../common/front-end-routing/navigate-to-url-injection-token";
+import type { MessageChannel, MessageChannelListener } from "../../common/utils/channel/message-channel-listener-injection-token";
 import { messageChannelListenerInjectionToken } from "../../common/utils/channel/message-channel-listener-injection-token";
 
 const navigationChannelListenerInjectable = getInjectable({
@@ -15,8 +17,6 @@ const navigationChannelListenerInjectable = getInjectable({
 
   instantiate: (di) => {
     const currentlyInClusterFrame = di.inject(currentlyInClusterFrameInjectable);
-    const appNavigationChannel = di.inject(appNavigationChannelInjectable);
-    const clusterFrameNavigationChannel = di.inject(clusterFrameNavigationChannelInjectable);
     const focusWindow = di.inject(focusWindowInjectable);
     const navigateToUrl = di.inject(navigateToUrlInjectionToken);
 
@@ -34,7 +34,7 @@ const navigationChannelListenerInjectable = getInjectable({
       },
     };
   },
-  injectionToken: messageChannelListenerInjectionToken,
+  injectionToken: messageChannelListenerInjectionToken as InjectionToken<MessageChannelListener<MessageChannel<string>>, void>,
 });
 
 export default navigationChannelListenerInjectable;
diff --git a/src/renderer/port-forward/port-forward-store/port-forward-store.injectable.ts b/src/renderer/port-forward/port-forward-store/port-forward-store.injectable.ts
index 4e834d0650..5339a3e4e7 100644
--- a/src/renderer/port-forward/port-forward-store/port-forward-store.injectable.ts
+++ b/src/renderer/port-forward/port-forward-store/port-forward-store.injectable.ts
@@ -7,6 +7,8 @@ import { PortForwardStore } from "./port-forward-store";
 import type { ForwardedPort } from "../port-forward-item";
 import createStorageInjectable from "../../utils/create-storage/create-storage.injectable";
 import notifyErrorPortForwardingInjectable from "../notify-error-port-forwarding.injectable";
+import { apiBaseInjectionToken } from "../../../common/k8s-api/api-base";
+import requestActivePortForwardInjectable from "./request-active-port-forward.injectable";
 
 const portForwardStoreInjectable = getInjectable({
   id: "port-forward-store",
@@ -14,14 +16,14 @@ const portForwardStoreInjectable = getInjectable({
   instantiate: (di) => {
     const createStorage = di.inject(createStorageInjectable);
 
-    const storage = createStorage<ForwardedPort[] | undefined>(
-      "port_forwards",
-      undefined,
-    );
-
     return new PortForwardStore({
-      storage,
+      storage: createStorage<ForwardedPort[] | undefined>(
+        "port_forwards",
+        undefined,
+      ),
       notifyErrorPortForwarding: di.inject(notifyErrorPortForwardingInjectable),
+      apiBase: di.inject(apiBaseInjectionToken),
+      requestActivePortForward: di.inject(requestActivePortForwardInjectable),
     });
   },
 });
diff --git a/src/renderer/port-forward/port-forward-store/port-forward-store.ts b/src/renderer/port-forward/port-forward-store/port-forward-store.ts
index 542996e00b..179dd2f39c 100644
--- a/src/renderer/port-forward/port-forward-store/port-forward-store.ts
+++ b/src/renderer/port-forward/port-forward-store/port-forward-store.ts
@@ -9,19 +9,22 @@ import type { StorageLayer } from "../../utils";
 import { autoBind, disposer } from "../../utils";
 import type { ForwardedPort } from "../port-forward-item";
 import { PortForwardItem } from "../port-forward-item";
-import { apiBase } from "../../api";
 import { waitUntilFree } from "tcp-port-used";
 import logger from "../../../common/logger";
+import type { JsonApi } from "../../../common/k8s-api/json-api";
+import type { RequestActivePortForward } from "./request-active-port-forward.injectable";
 
 interface Dependencies {
-  storage: StorageLayer<ForwardedPort[] | undefined>;
+  readonly storage: StorageLayer<ForwardedPort[] | undefined>;
   notifyErrorPortForwarding: (message: string) => void;
+  readonly apiBase: JsonApi; // TODO: replace with individual dependencies
+  requestActivePortForward: RequestActivePortForward;
 }
 
 export class PortForwardStore extends ItemStore<PortForwardItem> {
   @observable portForwards: PortForwardItem[] = [];
 
-  constructor(private dependencies: Dependencies) {
+  constructor(protected readonly dependencies: Dependencies) {
     super();
     makeObservable(this);
     autoBind(this);
@@ -222,7 +225,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
     const { port, forwardPort } = portForward;
 
     try {
-      await apiBase.del(
+      await this.dependencies.apiBase.del(
         `/pods/port-forward/${portForward.namespace}/${portForward.kind}/${portForward.name}`,
         { query: { port, forwardPort }},
       );
@@ -272,10 +275,10 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
     }
 
     const { port, forwardPort } = pf;
-    let response: PortForwardResult;
+    let response: { port: number };
 
     try {
-      response = await apiBase.post<PortForwardResult>(
+      response = await this.dependencies.apiBase.post(
         `/pods/port-forward/${pf.namespace}/${pf.kind}/${pf.name}`,
         { query: { port, forwardPort }},
       );
@@ -322,7 +325,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
 
     try {
       // check if the port-forward is active, and if so check if it has the same local port
-      const pf = await getActivePortForward(portForward);
+      const pf = await this.dependencies.requestActivePortForward(portForward);
 
       if (pf?.forwardPort && pf.forwardPort !== portForward.forwardPort) {
         logger.warn(
@@ -338,10 +341,6 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
   };
 }
 
-interface PortForwardResult {
-  port: number;
-}
-
 function portForwardsEqual(portForward: ForwardedPort) {
   return (pf: ForwardedPort) => (
     pf.kind == portForward.kind &&
@@ -350,21 +349,3 @@ function portForwardsEqual(portForward: ForwardedPort) {
     pf.port == portForward.port
   );
 }
-
-async function getActivePortForward(portForward: ForwardedPort): Promise<ForwardedPort | undefined> {
-  const { port, forwardPort } = portForward;
-  let response: PortForwardResult;
-
-  try {
-    response = await apiBase.get<PortForwardResult>(`/pods/port-forward/${portForward.namespace}/${portForward.kind}/${portForward.name}`, { query: { port, forwardPort }});
-  } catch (error) {
-    logger.warn(`[PORT-FORWARD-STORE] Error getting active port-forward: ${error}`, portForward);
-
-    return undefined;
-  }
-
-  portForward.status = response?.port ? "Active" : "Disabled";
-  portForward.forwardPort = response?.port;
-
-  return portForward;
-}
diff --git a/src/renderer/port-forward/port-forward-store/request-active-port-forward.injectable.ts b/src/renderer/port-forward/port-forward-store/request-active-port-forward.injectable.ts
new file mode 100644
index 0000000000..4939f4d955
--- /dev/null
+++ b/src/renderer/port-forward/port-forward-store/request-active-port-forward.injectable.ts
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectable } from "@ogre-tools/injectable";
+import { apiBaseInjectionToken } from "../../../common/k8s-api/api-base";
+import loggerInjectable from "../../../common/logger.injectable";
+import { urlBuilderFor } from "../../../common/utils/buildUrl";
+import type { ForwardedPort } from "../port-forward-item";
+
+export type RequestActivePortForward = (portForward: ForwardedPort) => Promise<ForwardedPort | undefined>;
+
+const requestActiveEndpoint = urlBuilderFor("/pods/port-forward/:namespace/:kind/:name");
+
+const requestActivePortForwardInjectable = getInjectable({
+  id: "request-active-port-forward",
+  instantiate: (di): RequestActivePortForward => {
+    const apiBase = di.inject(apiBaseInjectionToken);
+    const logger = di.inject(loggerInjectable);
+
+    return async ({ port, forwardPort, namespace, kind, name, ...rest }) => {
+      try {
+        const response: { port: number } = await apiBase.get(requestActiveEndpoint.compile({ namespace, kind, name }), { query: { port, forwardPort }});
+
+        return {
+          status: response.port ? "Active" : "Disabled",
+          forwardPort: response.port,
+          port,
+          namespace,
+          kind,
+          name,
+          ...rest,
+        };
+      } catch (error) {
+        logger.warn(`[PORT-FORWARD-STORE] Error getting active port-forward: ${error}`, { namespace, kind, name });
+
+        return undefined;
+      }
+    };
+  },
+});
+
+export default requestActivePortForwardInjectable;
diff --git a/src/renderer/protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.injectable.ts b/src/renderer/protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.injectable.ts
index 8c6e70f8c2..cb6f4652ce 100644
--- a/src/renderer/protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.injectable.ts
+++ b/src/renderer/protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.injectable.ts
@@ -11,9 +11,11 @@ import navigateToAddClusterInjectable from "../../../common/front-end-routing/ro
 import navigateToExtensionsInjectable from "../../../common/front-end-routing/routes/extensions/navigate-to-extensions.injectable";
 import navigateToEntitySettingsInjectable from "../../../common/front-end-routing/routes/entity-settings/navigate-to-entity-settings.injectable";
 import navigateToClusterViewInjectable from "../../../common/front-end-routing/routes/cluster-view/navigate-to-cluster-view.injectable";
-import navigateToPreferenceTabIdInjectable from "./navigate-to-preference-tab-id.injectable";
 import catalogEntityRegistryInjectable from "../../api/catalog/entity/registry.injectable";
 
+// TODO: Importing from features is not OK. Make protocol-router to comply with Open Closed Principle to allow moving implementation under a feature
+import navigateToPreferencesInjectable from "../../../features/preferences/common/navigate-to-preferences.injectable";
+
 const bindProtocolAddRouteHandlersInjectable = getInjectable({
   id: "bind-protocol-add-route-handlers",
 
@@ -25,7 +27,7 @@ const bindProtocolAddRouteHandlersInjectable = getInjectable({
     navigateToExtensions: di.inject(navigateToExtensionsInjectable),
     navigateToEntitySettings: di.inject(navigateToEntitySettingsInjectable),
     navigateToClusterView: di.inject(navigateToClusterViewInjectable),
-    navigateToPreferenceTabId: di.inject(navigateToPreferenceTabIdInjectable),
+    navigateToPreferences: di.inject(navigateToPreferencesInjectable),
     entityRegistry: di.inject(catalogEntityRegistryInjectable),
   }),
 });
diff --git a/src/renderer/protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.tsx b/src/renderer/protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.tsx
index 40ab3b502c..ad8b0e007f 100644
--- a/src/renderer/protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.tsx
+++ b/src/renderer/protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.tsx
@@ -28,7 +28,7 @@ interface Dependencies {
   navigateToExtensions: () => void;
   navigateToEntitySettings: NavigateToEntitySettings;
   navigateToClusterView: NavigateToClusterView;
-  navigateToPreferenceTabId: (tabId: string) => void;
+  navigateToPreferences: (tabId: string) => void;
   entityRegistry: CatalogEntityRegistry;
 }
 
@@ -40,13 +40,13 @@ export const bindProtocolAddRouteHandlers = ({
   navigateToExtensions,
   navigateToEntitySettings,
   navigateToClusterView,
-  navigateToPreferenceTabId,
+  navigateToPreferences,
   entityRegistry,
 }: Dependencies) => () => {
   lensProtocolRouterRenderer
     .addInternalHandler("/preferences", ({ search: { highlight: tabId }}) => {
       if (tabId) {
-        navigateToPreferenceTabId(tabId);
+        navigateToPreferences(tabId);
       }
     })
     .addInternalHandler("/", ({ tail }) => {
diff --git a/src/renderer/protocol-handler/bind-protocol-add-route-handlers/navigate-to-preference-tab-id.injectable.ts b/src/renderer/protocol-handler/bind-protocol-add-route-handlers/navigate-to-preference-tab-id.injectable.ts
deleted file mode 100644
index 5c6aa2177e..0000000000
--- a/src/renderer/protocol-handler/bind-protocol-add-route-handlers/navigate-to-preference-tab-id.injectable.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import preferenceNavigationItemsInjectable from "../../components/+preferences/preferences-navigation/preference-navigation-items.injectable";
-import navigateToPreferencesInjectable from "../../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable";
-
-const navigateToPreferenceTabIdInjectable = getInjectable({
-  id: "navigate-to-preference-tab-id",
-
-  instantiate: (di) => {
-    const preferenceNavigationItems = di.inject(preferenceNavigationItemsInjectable);
-    const navigateToPreferences = di.inject(navigateToPreferencesInjectable);
-
-    return (tabId: string) => {
-      const targetTab = preferenceNavigationItems.get().find(item => item.id === tabId);
-
-      if (targetTab) {
-        targetTab.navigate();
-
-        return;
-      }
-
-      navigateToPreferences();
-    };
-  },
-});
-
-export default navigateToPreferenceTabIdInjectable;
diff --git a/src/renderer/protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.tsx b/src/renderer/protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.tsx
index 8015678361..0875037134 100644
--- a/src/renderer/protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.tsx
+++ b/src/renderer/protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.tsx
@@ -7,30 +7,10 @@ import React from "react";
 import { ipcRenderer } from "electron";
 import * as proto from "../../../common/protocol-handler";
 import Url from "url-parse";
-import { onCorrect } from "../../../common/ipc";
 import type { LensProtocolRouterDependencies } from "../../../common/protocol-handler";
 import { foldAttemptResults, ProtocolHandlerInvalid, RouteAttempt } from "../../../common/protocol-handler";
 import { Notifications } from "../../components/notifications";
 
-function verifyIpcArgs(args: unknown[]): args is [string, RouteAttempt] {
-  if (args.length !== 2) {
-    return false;
-  }
-
-  if (typeof args[0] !== "string") {
-    return false;
-  }
-
-  switch (args[1]) {
-    case RouteAttempt.MATCHED:
-    case RouteAttempt.MISSING:
-    case RouteAttempt.MISSING_EXTENSION:
-      return true;
-    default:
-      return false;
-  }
-}
-
 interface Dependencies extends LensProtocolRouterDependencies {}
 
 export class LensProtocolRouterRenderer extends proto.LensProtocolRouter {
@@ -42,75 +22,58 @@ export class LensProtocolRouterRenderer extends proto.LensProtocolRouter {
    * This function is needed to be called early on in the renderers lifetime.
    */
   public init(): void {
-    onCorrect({
-      channel: proto.ProtocolHandlerInternal,
-      source: ipcRenderer,
-      verifier: verifyIpcArgs,
-      listener: (event, rawUrl, mainAttemptResult) => {
-        const rendererAttempt = this._routeToInternal(new Url(rawUrl, true));
+    ipcRenderer.on(proto.ProtocolHandlerInternal, (event, rawUrl: string, mainAttemptResult: RouteAttempt) => {
+      const rendererAttempt = this._routeToInternal(new Url(rawUrl, true));
 
-        if (foldAttemptResults(mainAttemptResult, rendererAttempt) === RouteAttempt.MISSING) {
+      if (foldAttemptResults(mainAttemptResult, rendererAttempt) === RouteAttempt.MISSING) {
+        Notifications.shortInfo((
+          <p>
+            {"Unknown action "}
+            <code>{rawUrl}</code>
+            {". Are you on the latest version?"}
+          </p>
+        ));
+      }
+    });
+    ipcRenderer.on(proto.ProtocolHandlerExtension, async (event, rawUrl: string, mainAttemptResult: RouteAttempt) => {
+      const rendererAttempt = await this._routeToExtension(new Url(rawUrl, true));
+
+      switch (foldAttemptResults(mainAttemptResult, rendererAttempt)) {
+        case RouteAttempt.MISSING:
           Notifications.shortInfo((
             <p>
               {"Unknown action "}
               <code>{rawUrl}</code>
-              {". Are you on the latest version?"}
+              {". Are you on the latest version of the extension?"}
             </p>
           ));
-        }
-      },
-    });
-    onCorrect({
-      channel: proto.ProtocolHandlerExtension,
-      source: ipcRenderer,
-      verifier: verifyIpcArgs,
-      listener: async (event, rawUrl, mainAttemptResult) => {
-        const rendererAttempt = await this._routeToExtension(new Url(rawUrl, true));
-
-        switch (foldAttemptResults(mainAttemptResult, rendererAttempt)) {
-          case RouteAttempt.MISSING:
-            Notifications.shortInfo((
-              <p>
-                {"Unknown action "}
-                <code>{rawUrl}</code>
-                {". Are you on the latest version of the extension?"}
-              </p>
-            ));
-            break;
-          case RouteAttempt.MISSING_EXTENSION:
-            Notifications.shortInfo((
-              <p>
-                {"Missing extension for action "}
-                <code>{rawUrl}</code>
-                {". Not able to find extension in our known list. Try installing it manually."}
-              </p>
-            ));
-            break;
-        }
-      },
-    });
-    onCorrect({
-      channel: ProtocolHandlerInvalid,
-      source: ipcRenderer,
-      listener: (event, error, rawUrl) => {
-        Notifications.error((
-          <>
+          break;
+        case RouteAttempt.MISSING_EXTENSION:
+          Notifications.shortInfo((
             <p>
-              {"Failed to route "}
+              {"Missing extension for action "}
               <code>{rawUrl}</code>
-              .
+              {". Not able to find extension in our known list. Try installing it manually."}
             </p>
-            <p>
-              <b>Error:</b>
-              {" "}
-              {error}
-            </p>
-          </>
-        ));
-      },
-      verifier: (args): args is [string, string] => {
-        return args.length === 2 && typeof args[0] === "string";
-      },
+          ));
+          break;
+      }
+    });
+    ipcRenderer.on(ProtocolHandlerInvalid, (event, error: string, rawUrl: string) => {
+      Notifications.error((
+        <>
+          <p>
+            {"Failed to route "}
+            <code>{rawUrl}</code>
+            .
+          </p>
+          <p>
+            <b>Error:</b>
+            {" "}
+            {error}
+          </p>
+        </>
+      ));
     });
   }
 }
diff --git a/src/renderer/routes/current-route-component.injectable.ts b/src/renderer/routes/current-route-component.injectable.ts
index 56b047c37b..a4a8133c4f 100644
--- a/src/renderer/routes/current-route-component.injectable.ts
+++ b/src/renderer/routes/current-route-component.injectable.ts
@@ -4,7 +4,6 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
-import { matches } from "lodash/fp";
 import { computed } from "mobx";
 import currentRouteInjectable from "./current-route.injectable";
 import { routeSpecificComponentInjectionToken } from "./route-specific-component-injection-token";
@@ -24,11 +23,13 @@ const currentRouteComponentInjectable = getInjectable({
         return undefined;
       }
 
-      const routeSpecificComponent = routeComponents
+      return routeComponents
         .get()
-        .find(matches({ route: currentRoute }));
-
-      return routeSpecificComponent?.Component;
+        .find(({ route }) => (
+          route.path === currentRoute.path
+          && route.clusterFrame === currentRoute.clusterFrame
+        ))
+        ?.Component;
     });
   },
 });
diff --git a/src/renderer/stores/init-user-store.injectable.ts b/src/renderer/stores/init-user-store.injectable.ts
new file mode 100644
index 0000000000..2c5b15dd1b
--- /dev/null
+++ b/src/renderer/stores/init-user-store.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import userStoreInjectable from "../../common/user-store/user-store.injectable";
+import { beforeFrameStartsInjectionToken } from "../before-frame-starts/before-frame-starts-injection-token";
+import initDefaultUpdateChannelInjectable from "../vars/default-update-channel/init.injectable";
+
+const initUserStoreInjectable = getInjectable({
+  id: "init-user-store",
+  instantiate: (di) => {
+    const userStore = di.inject(userStoreInjectable);
+
+    return {
+      id: "init-user-store",
+      run: () => userStore.load(),
+      runAfter: di.inject(initDefaultUpdateChannelInjectable),
+    };
+  },
+  injectionToken: beforeFrameStartsInjectionToken,
+});
+
+export default initUserStoreInjectable;
diff --git a/src/renderer/utils/__tests__/jsonPath.test.tsx b/src/renderer/utils/__tests__/jsonPath.test.ts
similarity index 89%
rename from src/renderer/utils/__tests__/jsonPath.test.tsx
rename to src/renderer/utils/__tests__/jsonPath.test.ts
index 49e75585f9..312522a63f 100644
--- a/src/renderer/utils/__tests__/jsonPath.test.tsx
+++ b/src/renderer/utils/__tests__/jsonPath.test.ts
@@ -5,7 +5,7 @@
 
 import { convertKubectlJsonPathToNodeJsonPath, safeJSONPathValue } from "../jsonPath";
 
-describe("parseJsonPath", () => {
+describe("convertKubectlJsonPathToNodeJsonPath", () => {
   it("should convert \\. to use indexed notation", () => {
     const res = convertKubectlJsonPathToNodeJsonPath(".metadata.labels.kubesphere\\.io/alias-name");
 
@@ -82,13 +82,13 @@ describe("safeJSONPathValue", () => {
   it("should convert boolean values to strings", () => {
     const res = safeJSONPathValue({ bar: false }, ".bar");
 
-    expect(res).toBe("false");
+    expect(res).toBe(false);
   });
 
   it("should convert number values to strings", () => {
     const res = safeJSONPathValue({ bar: 0 }, ".bar");
 
-    expect(res).toBe("0");
+    expect(res).toBe(0);
   });
 
   it("should join sliced entries with commas only", () => {
@@ -103,7 +103,7 @@ describe("safeJSONPathValue", () => {
       ],
     }, ".bar[].foo");
 
-    expect(res).toBe("1");
+    expect(res).toBe(1);
   });
 
   it("should join an array of values using JSON.stringify", () => {
@@ -114,7 +114,7 @@ describe("safeJSONPathValue", () => {
       ],
     }, ".bar");
 
-    expect(res).toBe(`["world","hello"]`);
+    expect(res).toEqual(["world", "hello"]);
   });
 
   it("should stringify an object value", () => {
@@ -122,7 +122,7 @@ describe("safeJSONPathValue", () => {
       foo: { bar: "bat" },
     }, ".foo");
 
-    expect(res).toBe(`{"bar":"bat"}`);
+    expect(res).toEqual({ "bar":"bat" });
   });
 
   it("should use convertKubectlJsonPathToNodeJsonPath", () => {
@@ -155,7 +155,7 @@ describe("safeJSONPathValue", () => {
 
     const res = safeJSONPathValue(obj, ".spec.metrics[*].external.highWatermark..");
 
-    expect(res).toBe("100, 100");
+    expect(res).toEqual(["100", "100"]);
   });
 
   it("should not throw if path is invalid jsonpath", () => {
@@ -163,6 +163,16 @@ describe("safeJSONPathValue", () => {
       foo: { "hello.world": "bat" },
     }, "asd[");
 
-    expect(res).toBe("<unknown>");
+    expect(res).toBe(undefined);
+  });
+
+  it("should retrive value with '/' in jsonpath", () => {
+    const res = safeJSONPathValue({
+      foo: {
+        "hello/world": "bat",
+      },
+    }, ".foo.hello/world");
+
+    expect(res).toBe("bat");
   });
 });
diff --git a/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts b/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts
index 6d76e35340..1e5b14bb40 100644
--- a/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts
+++ b/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.injectable.ts
@@ -6,8 +6,6 @@ import ipcRendererInjectable from "../ipc-renderer.injectable";
 import { getInjectable } from "@ogre-tools/injectable";
 import type { IpcRendererEvent } from "electron";
 import { enlistMessageChannelListenerInjectionToken } from "../../../../common/utils/channel/enlist-message-channel-listener-injection-token";
-import { tentativeParseJson } from "../../../../common/utils/tentative-parse-json";
-import { pipeline } from "@ogre-tools/fp";
 
 const enlistMessageChannelListenerInjectable = getInjectable({
   id: "enlist-message-channel-listener-for-renderer",
@@ -17,11 +15,7 @@ const enlistMessageChannelListenerInjectable = getInjectable({
 
     return ({ channel, handler }) => {
       const nativeCallback = (_: IpcRendererEvent, message: unknown) => {
-        pipeline(
-          message,
-          tentativeParseJson,
-          handler,
-        );
+        handler(message);
       };
 
       ipcRenderer.on(channel.id, nativeCallback);
diff --git a/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts b/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts
index 4653dcdd5d..f5555d94f3 100644
--- a/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts
+++ b/src/renderer/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts
@@ -88,8 +88,8 @@ describe("enlist message channel listener in renderer", () => {
       expect(handlerMock).toHaveBeenCalledWith(true);
     });
 
-    it("given stringified object as message, when message arrives, calls the handler with the message", () => {
-      onMock.mock.calls[0][1]({} as IpcRendererEvent, JSON.stringify({ some: "object" }));
+    it("given object as message, when message arrives, calls the handler with the message", () => {
+      onMock.mock.calls[0][1]({} as IpcRendererEvent, { some: "object" });
 
       expect(handlerMock).toHaveBeenCalledWith({ some: "object" });
     });
diff --git a/src/renderer/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts b/src/renderer/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts
deleted file mode 100644
index 03253a06f2..0000000000
--- a/src/renderer/utils/channel/channel-listeners/enlist-request-channel-listener.injectable.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { enlistRequestChannelListenerInjectionToken } from "../../../../common/utils/channel/enlist-request-channel-listener-injection-token";
-
-const enlistRequestChannelListenerInjectable = getInjectable({
-  id: "enlist-request-channel-listener-for-renderer",
-
-  instantiate: () => {
-    // Requests from main to renderer are not implemented yet.
-    return () => () => {};
-  },
-
-  injectionToken: enlistRequestChannelListenerInjectionToken,
-});
-
-export default enlistRequestChannelListenerInjectable;
diff --git a/src/renderer/utils/channel/channel-listeners/start-listening-of-channels.injectable.ts b/src/renderer/utils/channel/channel-listeners/start-listening-of-channels.injectable.ts
index c37c9b1864..3b10ef6bd9 100644
--- a/src/renderer/utils/channel/channel-listeners/start-listening-of-channels.injectable.ts
+++ b/src/renderer/utils/channel/channel-listeners/start-listening-of-channels.injectable.ts
@@ -4,15 +4,16 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { beforeFrameStartsInjectionToken } from "../../../before-frame-starts/before-frame-starts-injection-token";
-import listeningOfChannelsInjectable from "../../../../common/utils/channel/listening-of-channels.injectable";
+import listeningOnMessageChannelsInjectable from "../../../../common/utils/channel/listening-on-message-channels.injectable";
 
 const startListeningOfChannelsInjectable = getInjectable({
   id: "start-listening-of-channels-renderer",
 
   instantiate: (di) => {
-    const listeningOfChannels = di.inject(listeningOfChannelsInjectable);
+    const listeningOfChannels = di.inject(listeningOnMessageChannelsInjectable);
 
     return {
+      id: "start-listening-of-channels-renderer",
       run: async () => {
         await listeningOfChannels.start();
       },
diff --git a/src/renderer/utils/channel/message-to-channel.injectable.ts b/src/renderer/utils/channel/message-to-channel.injectable.ts
index 3e493fd322..eab7e4ec7f 100644
--- a/src/renderer/utils/channel/message-to-channel.injectable.ts
+++ b/src/renderer/utils/channel/message-to-channel.injectable.ts
@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { messageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
+import type { SendMessageToChannel } from "../../../common/utils/channel/message-to-channel-injection-token";
+import { sendMessageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
 import sendToMainInjectable from "./send-to-main.injectable";
-import type { MessageChannel } from "../../../common/utils/channel/message-channel-injection-token";
 
 const messageToChannelInjectable = getInjectable({
   id: "message-to-channel",
@@ -13,14 +13,12 @@ const messageToChannelInjectable = getInjectable({
   instantiate: (di) => {
     const sendToMain = di.inject(sendToMainInjectable);
 
-    // TODO: Figure out way to improve typing in internals
-    // Notice that this should be injected using "messageToChannelInjectionToken" which is typed correctly.
-    return (channel: MessageChannel<any>, message?: unknown) => {
+    return ((channel, message) => {
       sendToMain(channel.id, message);
-    };
+    }) as SendMessageToChannel;
   },
 
-  injectionToken: messageToChannelInjectionToken,
+  injectionToken: sendMessageToChannelInjectionToken,
 });
 
 export default messageToChannelInjectable;
diff --git a/src/renderer/utils/channel/message-to-channel.test.ts b/src/renderer/utils/channel/message-to-channel.test.ts
deleted file mode 100644
index 443abfb0dc..0000000000
--- a/src/renderer/utils/channel/message-to-channel.test.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { MessageToChannel } from "../../../common/utils/channel/message-to-channel-injection-token";
-import type { MessageChannel } from "../../../common/utils/channel/message-channel-injection-token";
-import { getDiForUnitTesting } from "../../getDiForUnitTesting";
-import { messageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
-import ipcRendererInjectable from "./ipc-renderer.injectable";
-import type { IpcRenderer } from "electron";
-
-describe("message to channel from renderer", () => {
-  let messageToChannel: MessageToChannel;
-  let sendMock: jest.Mock;
-
-  beforeEach(() => {
-    const di = getDiForUnitTesting({ doGeneralOverrides: true });
-
-    sendMock = jest.fn();
-
-    di.override(ipcRendererInjectable, () => ({
-      send: sendMock,
-    }) as unknown as IpcRenderer);
-
-    messageToChannel = di.inject(messageToChannelInjectionToken);
-  });
-
-  it("given string as message, when messaging to channel, sends stringified message", () => {
-    messageToChannel(someChannel, "some-message");
-
-    expect(sendMock).toHaveBeenCalledWith("some-channel-id", '"some-message"');
-  });
-
-  it("given boolean as message, when messaging to channel, sends stringified message", () => {
-    messageToChannel(someChannel, true);
-
-    expect(sendMock).toHaveBeenCalledWith("some-channel-id", "true");
-  });
-
-  it("given number as message, when messaging to channel, sends stringified message", () => {
-    messageToChannel(someChannel, 42);
-
-    expect(sendMock).toHaveBeenCalledWith("some-channel-id", "42");
-  });
-
-  it("given object as message, when messaging to channel, sends stringified message", () => {
-    messageToChannel(someChannel, { some: "object" });
-
-    expect(sendMock).toHaveBeenCalledWith(
-      "some-channel-id",
-      JSON.stringify({ some: "object" }),
-    );
-  });
-});
-
-const someChannel: MessageChannel<any> = { id: "some-channel-id" };
diff --git a/src/renderer/utils/channel/request-from-channel.injectable.ts b/src/renderer/utils/channel/request-from-channel.injectable.ts
index f77287a2ed..fd0815b1a3 100644
--- a/src/renderer/utils/channel/request-from-channel.injectable.ts
+++ b/src/renderer/utils/channel/request-from-channel.injectable.ts
@@ -4,10 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import ipcRendererInjectable from "./ipc-renderer.injectable";
+import type { RequestFromChannel } from "../../../common/utils/channel/request-from-channel-injection-token";
 import { requestFromChannelInjectionToken } from "../../../common/utils/channel/request-from-channel-injection-token";
-import { pipeline } from "@ogre-tools/fp";
-import { tentativeStringifyJson } from "../../../common/utils/tentative-stringify-json";
-import { tentativeParseJson } from "../../../common/utils/tentative-parse-json";
 
 const requestFromChannelInjectable = getInjectable({
   id: "request-from-channel",
@@ -15,13 +13,7 @@ const requestFromChannelInjectable = getInjectable({
   instantiate: (di) => {
     const ipcRenderer = di.inject(ipcRendererInjectable);
 
-    return async (channel, ...[request]) =>
-      await pipeline(
-        request,
-        tentativeStringifyJson,
-        (req) => ipcRenderer.invoke(channel.id, req),
-        tentativeParseJson,
-      );
+    return ((channel, request) => ipcRenderer.invoke(channel.id, request)) as RequestFromChannel;
   },
 
   injectionToken: requestFromChannelInjectionToken,
diff --git a/src/renderer/utils/channel/request-from-channel.test.ts b/src/renderer/utils/channel/request-from-channel.test.ts
deleted file mode 100644
index d7b343bf02..0000000000
--- a/src/renderer/utils/channel/request-from-channel.test.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { MessageChannel } from "../../../common/utils/channel/message-channel-injection-token";
-import { getDiForUnitTesting } from "../../getDiForUnitTesting";
-import ipcRendererInjectable from "./ipc-renderer.injectable";
-import type { IpcRenderer } from "electron";
-import type { AsyncFnMock } from "@async-fn/jest";
-import asyncFn from "@async-fn/jest";
-import type { RequestFromChannel } from "../../../common/utils/channel/request-from-channel-injection-token";
-import { requestFromChannelInjectionToken } from "../../../common/utils/channel/request-from-channel-injection-token";
-import requestFromChannelInjectable from "./request-from-channel.injectable";
-import { getPromiseStatus } from "../../../common/test-utils/get-promise-status";
-
-describe("request from channel in renderer", () => {
-  let requestFromChannel: RequestFromChannel;
-  let invokeMock: AsyncFnMock<(channelId: string, request: any) => any>;
-
-  beforeEach(() => {
-    const di = getDiForUnitTesting({ doGeneralOverrides: true });
-
-    di.unoverride(requestFromChannelInjectable);
-
-    invokeMock = asyncFn();
-
-    di.override(ipcRendererInjectable, () => ({
-      invoke: invokeMock,
-    }) as unknown as IpcRenderer);
-
-    requestFromChannel = di.inject(requestFromChannelInjectionToken);
-  });
-
-  describe("when messaging to channel", () => {
-    let actualPromise: Promise<any>;
-
-    beforeEach(() => {
-      actualPromise = requestFromChannel(someChannel, "some-message");
-    });
-
-    it("sends stringified message", () => {
-      expect(invokeMock).toHaveBeenCalledWith("some-channel-id", '"some-message"');
-    });
-
-    it("does not resolve yet", async () => {
-      const promiseStatus = await getPromiseStatus(actualPromise);
-
-      expect(promiseStatus.fulfilled).toBe(false);
-    });
-
-    it("when invoking resolves, resolves", async () => {
-      await invokeMock.resolve("some-response");
-
-      const actual = await actualPromise;
-
-      expect(actual).toBe("some-response");
-    });
-
-    it("when invoking resolves with stringified string, resolves with string", async () => {
-      await invokeMock.resolve('"some-response"');
-
-      const actual = await actualPromise;
-
-      expect(actual).toBe("some-response");
-    });
-
-    it("when invoking resolves with stringified boolean, resolves with boolean", async () => {
-      await invokeMock.resolve("true");
-
-      const actual = await actualPromise;
-
-      expect(actual).toBe(true);
-    });
-
-    it("when invoking resolves with stringified number, resolves with number", async () => {
-      await invokeMock.resolve("42");
-
-      const actual = await actualPromise;
-
-      expect(actual).toBe(42);
-    });
-
-    it("when invoking resolves with stringified object, resolves with object", async () => {
-      await invokeMock.resolve(JSON.stringify({ some: "object" }));
-
-      const actual = await actualPromise;
-
-      expect(actual).toEqual({ some: "object" });
-    });
-  });
-
-  it("given string as message, when messaging to channel, sends stringified message", () => {
-    requestFromChannel(someChannel, "some-message");
-
-    expect(invokeMock).toHaveBeenCalledWith("some-channel-id", '"some-message"');
-  });
-
-  it("given boolean as message, when messaging to channel, sends stringified message", () => {
-    requestFromChannel(someChannel, true);
-
-    expect(invokeMock).toHaveBeenCalledWith("some-channel-id", "true");
-  });
-
-  it("given number as message, when messaging to channel, sends stringified message", () => {
-    requestFromChannel(someChannel, 42);
-
-    expect(invokeMock).toHaveBeenCalledWith("some-channel-id", "42");
-  });
-
-  it("given object as message, when messaging to channel, sends stringified message", () => {
-    requestFromChannel(someChannel, { some: "object" });
-
-    expect(invokeMock).toHaveBeenCalledWith(
-      "some-channel-id",
-      JSON.stringify({ some: "object" }),
-    );
-  });
-});
-
-const someChannel: MessageChannel<any> = { id: "some-channel-id" };
diff --git a/src/renderer/utils/channel/send-to-main.injectable.ts b/src/renderer/utils/channel/send-to-main.injectable.ts
index 0811a78798..6eb4540062 100644
--- a/src/renderer/utils/channel/send-to-main.injectable.ts
+++ b/src/renderer/utils/channel/send-to-main.injectable.ts
@@ -3,9 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type { JsonValue } from "type-fest";
 import ipcRendererInjectable from "./ipc-renderer.injectable";
-import { tentativeStringifyJson } from "../../../common/utils/tentative-stringify-json";
 
 const sendToMainInjectable = getInjectable({
   id: "send-to-main",
@@ -13,11 +11,8 @@ const sendToMainInjectable = getInjectable({
   instantiate: (di) => {
     const ipcRenderer = di.inject(ipcRendererInjectable);
 
-    // TODO: Figure out way to improve typing in internals
-    return <T>(channelId: string, message: JsonValue extends T ? T : never ) => {
-      const stringifiedMessage = tentativeStringifyJson(message);
-
-      ipcRenderer.send(channelId, ...(stringifiedMessage ? [stringifiedMessage] : []));
+    return (channelId: string, message: any) => {
+      ipcRenderer.send(channelId, message);
     };
   },
 });
diff --git a/src/renderer/utils/create-storage/create-storage.injectable.ts b/src/renderer/utils/create-storage/create-storage.injectable.ts
index b40eef738c..2d295b802b 100644
--- a/src/renderer/utils/create-storage/create-storage.injectable.ts
+++ b/src/renderer/utils/create-storage/create-storage.injectable.ts
@@ -9,9 +9,9 @@ import readJsonFileInjectable from "../../../common/fs/read-json-file.injectable
 import writeJsonFileInjectable from "../../../common/fs/write-json-file.injectable";
 import { observable } from "mobx";
 import loggerInjectable from "../../../common/logger.injectable";
-import getAbsolutePathInjectable from "../../../common/path/get-absolute-path.injectable";
 import hostedClusterIdInjectable from "../../cluster-frame-context/hosted-cluster-id.injectable";
 import storageSaveDelayInjectable from "./storage-save-delay.injectable";
+import joinPathsInjectable from "../../../common/path/join-paths.injectable";
 
 const createStorageInjectable = getInjectable({
   id: "create-storage",
@@ -26,7 +26,7 @@ const createStorageInjectable = getInjectable({
     writeJsonFile: di.inject(writeJsonFileInjectable),
     logger: di.inject(loggerInjectable),
     directoryForLensLocalStorage: di.inject(directoryForLensLocalStorageInjectable),
-    getAbsolutePath: di.inject(getAbsolutePathInjectable),
+    joinPaths: di.inject(joinPathsInjectable),
     hostedClusterId: di.inject(hostedClusterIdInjectable),
     saveDelay: di.inject(storageSaveDelayInjectable),
   }),
diff --git a/src/renderer/utils/create-storage/create-storage.ts b/src/renderer/utils/create-storage/create-storage.ts
index 501e425161..1149d479cc 100755
--- a/src/renderer/utils/create-storage/create-storage.ts
+++ b/src/renderer/utils/create-storage/create-storage.ts
@@ -8,10 +8,9 @@
 import { comparer, reaction, toJS, when } from "mobx";
 import type { StorageLayer } from "../storageHelper";
 import { StorageHelper } from "../storageHelper";
-import { isTestEnv } from "../../../common/vars";
 import type { JsonObject, JsonValue } from "type-fest";
 import type { Logger } from "../../../common/logger";
-import type { GetAbsolutePath } from "../../../common/path/get-absolute-path.injectable";
+import type { JoinPaths } from "../../../common/path/join-paths.injectable";
 
 interface Dependencies {
   storage: { initialized: boolean; loaded: boolean; data: Record<string, any> };
@@ -19,7 +18,7 @@ interface Dependencies {
   directoryForLensLocalStorage: string;
   readJsonFile: (filePath: string) => Promise<JsonValue>;
   writeJsonFile: (filePath: string, contentObject: JsonObject) => Promise<void>;
-  getAbsolutePath: GetAbsolutePath;
+  joinPaths: JoinPaths;
   hostedClusterId: string | undefined;
   saveDelay: number;
 }
@@ -31,7 +30,7 @@ export type CreateStorage = <T>(key: string, defaultValue: T) => StorageLayer<T>
  */
 export const createStorage = ({
   storage,
-  getAbsolutePath,
+  joinPaths,
   logger,
   directoryForLensLocalStorage,
   readJsonFile,
@@ -45,17 +44,14 @@ export const createStorage = ({
     storage.initialized = true;
 
     (async () => {
-      const filePath = getAbsolutePath(directoryForLensLocalStorage, `${hostedClusterId || "app"}.json`);
+      const filePath = joinPaths(directoryForLensLocalStorage, `${hostedClusterId || "app"}.json`);
 
       try {
         storage.data = (await readJsonFile(filePath)) as JsonObject;
       } catch {
         // do nothing
       } finally {
-        if (!isTestEnv) {
-          logger.info(`${logPrefix} loading finished for ${filePath}`);
-        }
-
+        logger.info(`${logPrefix} loading finished for ${filePath}`);
         storage.loaded = true;
       }
 
diff --git a/src/renderer/utils/jsonPath.ts b/src/renderer/utils/jsonPath.ts
index 3ba970a044..57fffbaea9 100644
--- a/src/renderer/utils/jsonPath.ts
+++ b/src/renderer/utils/jsonPath.ts
@@ -6,7 +6,7 @@
 import { JSONPath } from "@astronautlabs/jsonpath";
 import { TypedRegEx } from "typed-regex";
 
-const slashDashSearch = /[\\-]/g;
+const slashDashSearch = /[/\\-]/g;
 const pathByBareDots = /(?<=\w)\./;
 const textBeforeFirstSquare = /^.*(?=\[)/g;
 const backSlash = /\\/g;
@@ -22,6 +22,7 @@ const trailingDotDot = /\.\.$/;
  *
  * Known shorthands:
  * - Leading `$` is optional (but implied)
+ * - The string `/` can be used without a leading `\` escapement
  * - The string `\.` is used to denote the "value of '.'" and not "next key"
  * - The string `-` can be used while not in quotes
  * - `[]` as shorthand for `[0]`
@@ -75,7 +76,15 @@ function convertToIndexNotation(key: string, firstItem = false) {
   }
 }
 
-function formatJSONValue(value: unknown) {
+export function formatJSONValue(value: unknown): string {
+  if (value == null) {
+    return "";
+  }
+
+  if (Array.isArray(value)) {
+    return value.map(formatJSONValue).join(", ");
+  }
+
   if (typeof value === "object") {
     return JSON.stringify(value);
   }
@@ -88,21 +97,21 @@ function formatJSONValue(value: unknown) {
  *
  * This function will also stringify the value retreived from the object
  */
-export function safeJSONPathValue(obj: object, path: string): string {
+export function safeJSONPathValue(obj: object, path: string): unknown {
   try {
     const parsedPath = JSONPath.parse(convertKubectlJsonPathToNodeJsonPath(path));
-    const isSlice = parsedPath.some((exp: any) => exp.expression.type === "slice" || "wildcard");
+    const isSlice = parsedPath.some((exp: any) => exp.expression.type === "slice" || exp.expression.type === "wildcard");
     const value = JSONPath.query(obj, JSONPath.stringify(parsedPath), isSlice ? Infinity : 1);
 
     if (isSlice) {
-      return value.map(formatJSONValue).join(", ");
+      return value;
     }
 
-    return formatJSONValue(value[0]);
+    return value[0];
   } catch (error) {
     // something failed
     console.warn("[JSON-PATH]: failed to parse jsonpath", error);
 
-    return "<unknown>";
+    return undefined;
   }
 }
diff --git a/src/renderer/utils/prevDefault.ts b/src/renderer/utils/prevDefault.ts
index 3706c04721..73bb834021 100644
--- a/src/renderer/utils/prevDefault.ts
+++ b/src/renderer/utils/prevDefault.ts
@@ -17,7 +17,7 @@ import type React from "react";
 //  <Icon onClick={prevDefault(() => console.log('stay on the page and open dialog'))}/>
 // </a>
 
-export function prevDefault<E extends React.SyntheticEvent | Event>(callback: (evt: E) => any) {
+export function prevDefault<E extends React.SyntheticEvent | Event, R>(callback: (evt: E) => R): (event: E) => R {
   return function (evt: E) {
     evt.preventDefault();
     evt.stopPropagation();
diff --git a/src/renderer/utils/rbac.ts b/src/renderer/utils/rbac.ts
index 8f3745d3a5..46219febf6 100644
--- a/src/renderer/utils/rbac.ts
+++ b/src/renderer/utils/rbac.ts
@@ -10,6 +10,7 @@ export const ResourceNames: Record<KubeResource, string> = {
   "namespaces": "Namespaces",
   "nodes": "Nodes",
   "events": "Events",
+  "leases": "Leases",
   "resourcequotas": "Resource Quotas",
   "services": "Services",
   "secrets": "Secrets",
@@ -32,6 +33,7 @@ export const ResourceNames: Record<KubeResource, string> = {
   "podsecuritypolicies": "Pod Security Policies",
   "poddisruptionbudgets": "Pod Disruption Budgets",
   "priorityclasses": "Priority Classes",
+  "runtimeclasses": "Runtime Classes",
   "limitranges": "Limit Ranges",
   "roles": "Roles",
   "rolebindings": "Role Bindings",
diff --git a/src/renderer/utils/resolve-proxy/resolve-system-proxy.injectable.ts b/src/renderer/utils/resolve-proxy/resolve-system-proxy.injectable.ts
index 8fcb9063d0..5468a8c7b7 100644
--- a/src/renderer/utils/resolve-proxy/resolve-system-proxy.injectable.ts
+++ b/src/renderer/utils/resolve-proxy/resolve-system-proxy.injectable.ts
@@ -5,14 +5,13 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { resolveSystemProxyInjectionToken } from "../../../common/utils/resolve-system-proxy/resolve-system-proxy-injection-token";
 import requestFromChannelInjectable from "../channel/request-from-channel.injectable";
-import resolveSystemProxyChannelInjectable from "../../../common/utils/resolve-system-proxy/resolve-system-proxy-channel.injectable";
+import { resolveSystemProxyChannel } from "../../../common/utils/resolve-system-proxy/resolve-system-proxy-channel";
 
 const resolveSystemProxyInjectable = getInjectable({
   id: "resolve-system-proxy-for-renderer",
 
   instantiate: (di) => {
     const requestFromChannel = di.inject(requestFromChannelInjectable);
-    const resolveSystemProxyChannel = di.inject(resolveSystemProxyChannelInjectable);
 
     return async (url) => requestFromChannel(resolveSystemProxyChannel, url);
   },
diff --git a/src/renderer/utils/sync-box/provide-initial-values-for-sync-boxes.injectable.ts b/src/renderer/utils/sync-box/provide-initial-values-for-sync-boxes.injectable.ts
index 472aee497a..b356aa0b32 100644
--- a/src/renderer/utils/sync-box/provide-initial-values-for-sync-boxes.injectable.ts
+++ b/src/renderer/utils/sync-box/provide-initial-values-for-sync-boxes.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token";
-import syncBoxInitialValueChannelInjectable from "../../../common/utils/sync-box/sync-box-initial-value-channel.injectable";
+import { syncBoxInitialValueChannel } from "../../../common/utils/sync-box/channels";
 import createSyncBoxStateInjectable from "../../../common/utils/sync-box/sync-box-state.injectable";
 import { requestFromChannelInjectionToken } from "../../../common/utils/channel/request-from-channel-injection-token";
 import { runInAction } from "mobx";
@@ -17,7 +17,6 @@ const provideInitialValuesForSyncBoxesInjectable = getInjectable({
 
   instantiate: (di) => {
     const requestFromChannel = di.inject(requestFromChannelInjectionToken);
-    const syncBoxInitialValueChannel = di.inject(syncBoxInitialValueChannelInjectable);
 
     const syncBoxes = di.injectMany(syncBoxInjectionToken);
 
@@ -25,6 +24,7 @@ const provideInitialValuesForSyncBoxesInjectable = getInjectable({
       di.inject(createSyncBoxStateInjectable, syncBox.id).set(state);
 
     return {
+      id: "provide-initial-values-for-sync-boxes",
       run: async () => {
         const initialValues = await requestFromChannel(syncBoxInitialValueChannel);
 
diff --git a/src/renderer/vars/build-version/build-version.injectable.ts b/src/renderer/vars/build-version/build-version.injectable.ts
new file mode 100644
index 0000000000..a63a4102b0
--- /dev/null
+++ b/src/renderer/vars/build-version/build-version.injectable.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { createInitializableState } from "../../../common/initializable-state/create";
+import { requestFromChannelInjectionToken } from "../../../common/utils/channel/request-from-channel-injection-token";
+import { buildVersionChannel, buildVersionInjectionToken } from "../../../common/vars/build-semantic-version.injectable";
+
+const buildVersionInjectable = createInitializableState({
+  id: "build-version",
+  init: (di) => {
+    const requestFromChannel = di.inject(requestFromChannelInjectionToken);
+
+    return requestFromChannel(buildVersionChannel);
+  },
+  injectionToken: buildVersionInjectionToken,
+});
+
+export default buildVersionInjectable;
diff --git a/src/renderer/vars/build-version/init.injectable.ts b/src/renderer/vars/build-version/init.injectable.ts
new file mode 100644
index 0000000000..25aeb8d2bc
--- /dev/null
+++ b/src/renderer/vars/build-version/init.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token";
+import buildVersionInjectable from "./build-version.injectable";
+
+const initializeBuildVersionInjectable = getInjectable({
+  id: "initialize-build-version",
+  instantiate: (di) => {
+    const buildVersion = di.inject(buildVersionInjectable);
+
+    return {
+      id: "initialize-build-version",
+      run: () => buildVersion.init(),
+    };
+  },
+  injectionToken: beforeFrameStartsInjectionToken,
+});
+
+export default initializeBuildVersionInjectable;
diff --git a/src/renderer/vars/default-update-channel/init.injectable.ts b/src/renderer/vars/default-update-channel/init.injectable.ts
new file mode 100644
index 0000000000..be59abd536
--- /dev/null
+++ b/src/renderer/vars/default-update-channel/init.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token";
+import initReleaseChannelInjectable from "../release-channel/init.injectable";
+import defaultUpdateChannelInjectable from "../../../features/application-update/common/selected-update-channel/default-update-channel.injectable";
+
+const initDefaultUpdateChannelInjectable = getInjectable({
+  id: "init-default-update-channel",
+  instantiate: (di) => {
+    const defaultUpdateChannel = di.inject(defaultUpdateChannelInjectable);
+
+    return {
+      id: "init-default-update-channel",
+      run: () => defaultUpdateChannel.init(),
+      runAfter: di.inject(initReleaseChannelInjectable),
+    };
+  },
+  injectionToken: beforeFrameStartsInjectionToken,
+});
+
+export default initDefaultUpdateChannelInjectable;
diff --git a/src/renderer/vars/release-channel/init.injectable.ts b/src/renderer/vars/release-channel/init.injectable.ts
new file mode 100644
index 0000000000..14e92fccda
--- /dev/null
+++ b/src/renderer/vars/release-channel/init.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import releaseChannelInjectable from "../../../common/vars/release-channel.injectable";
+import { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token";
+import initSemanticBuildVersionInjectable from "../semantic-build-version/init.injectable";
+
+const initReleaseChannelInjectable = getInjectable({
+  id: "init-release-channel",
+  instantiate: (di) => {
+    const releaseChannel = di.inject(releaseChannelInjectable);
+
+    return {
+      id: "init-release-channel",
+      run: () => releaseChannel.init(),
+      runAfter: di.inject(initSemanticBuildVersionInjectable),
+    };
+  },
+  injectionToken: beforeFrameStartsInjectionToken,
+});
+
+export default initReleaseChannelInjectable;
diff --git a/src/renderer/vars/semantic-build-version/init.injectable.ts b/src/renderer/vars/semantic-build-version/init.injectable.ts
new file mode 100644
index 0000000000..393143219f
--- /dev/null
+++ b/src/renderer/vars/semantic-build-version/init.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import buildSemanticVersionInjectable from "../../../common/vars/build-semantic-version.injectable";
+import { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token";
+import initializeBuildVersionInjectable from "../build-version/init.injectable";
+
+const initSemanticBuildVersionInjectable = getInjectable({
+  id: "init-semantic-build-version",
+  instantiate: (di) => {
+    const buildSemanticVersion = di.inject(buildSemanticVersionInjectable);
+
+    return {
+      id: "init-semantic-build-version",
+      run: () => buildSemanticVersion.init(),
+      runAfter: di.inject(initializeBuildVersionInjectable),
+    };
+  },
+  injectionToken: beforeFrameStartsInjectionToken,
+});
+
+export default initSemanticBuildVersionInjectable;
diff --git a/src/test-utils/channel-fakes/override-channels.ts b/src/test-utils/channel-fakes/override-channels.ts
index 7d3a20cd75..798fcd84af 100644
--- a/src/test-utils/channel-fakes/override-channels.ts
+++ b/src/test-utils/channel-fakes/override-channels.ts
@@ -3,18 +3,27 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type { DiContainer } from "@ogre-tools/injectable";
+import type { SendToViewArgs } from "../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
 import { overrideMessagingFromMainToWindow } from "./override-messaging-from-main-to-window";
 import { overrideMessagingFromWindowToMain } from "./override-messaging-from-window-to-main";
 import { overrideRequestingFromWindowToMain } from "./override-requesting-from-window-to-main";
 
-export const overrideChannels = (mainDi: DiContainer) => {
-  const overrideMessagingFromMainToWindowForWindow = overrideMessagingFromMainToWindow(mainDi);
+export interface OverrideChannels {
+  overrideForWindow: (windowDi: DiContainer, windowId: string) => void;
+  sendToWindow: (windowId: string, args: SendToViewArgs) => void;
+}
+
+export const overrideChannels = (mainDi: DiContainer): OverrideChannels => {
+  const { overrideEnlistForWindow, sendToWindow } = overrideMessagingFromMainToWindow();
   const overrideMessagingFromWindowToForWindow = overrideMessagingFromWindowToMain(mainDi);
   const overrideRequestingFromWindowToMainForWindow = overrideRequestingFromWindowToMain(mainDi);
 
-  return (windowDi: DiContainer, windowId: string) => {
-    overrideMessagingFromMainToWindowForWindow(windowDi, windowId);
-    overrideMessagingFromWindowToForWindow(windowDi);
-    overrideRequestingFromWindowToMainForWindow(windowDi);
+  return {
+    overrideForWindow: (windowDi, windowId) => {
+      overrideEnlistForWindow(windowDi, windowId);
+      overrideMessagingFromWindowToForWindow(windowDi);
+      overrideRequestingFromWindowToMainForWindow(windowDi);
+    },
+    sendToWindow,
   };
 };
diff --git a/src/test-utils/channel-fakes/override-messaging-from-main-to-window.ts b/src/test-utils/channel-fakes/override-messaging-from-main-to-window.ts
index 852b2cfb0b..f9275c18b2 100644
--- a/src/test-utils/channel-fakes/override-messaging-from-main-to-window.ts
+++ b/src/test-utils/channel-fakes/override-messaging-from-main-to-window.ts
@@ -3,18 +3,22 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type {  MessageChannelListener } from "../../common/utils/channel/message-channel-listener-injection-token";
-import sendToChannelInElectronBrowserWindowInjectable from "../../main/start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable";
-import type { SendToViewArgs } from "../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
 import enlistMessageChannelListenerInjectableInRenderer from "../../renderer/utils/channel/channel-listeners/enlist-message-channel-listener.injectable";
 import type { DiContainer } from "@ogre-tools/injectable";
-import { tentativeParseJson } from "../../common/utils/tentative-parse-json";
-import { getOrInsert } from "../../common/utils";
+import { getOrInsert, getOrInsertSet } from "../../common/utils";
+import type { SendToViewArgs } from "../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
+import { deserialize, serialize } from "v8";
 
 type ListenerSet = Set<MessageChannelListener<any>>;
 type WindowListenerMap = Map<string, ListenerSet>;
 type ListenerFakeMap = Map<string, WindowListenerMap>;
 
-export const overrideMessagingFromMainToWindow = (mainDi: DiContainer) => {
+export interface OverriddenWindowMessaging {
+  sendToWindow(windowId: string, args: SendToViewArgs): void;
+  overrideEnlistForWindow(windowDi: DiContainer, windowId: string): void;
+}
+
+export const overrideMessagingFromMainToWindow = (): OverriddenWindowMessaging => {
   const messageChannelListenerFakesForRenderer: ListenerFakeMap = new Map();
 
   const getWindowListeners = (channelId: string, windowId: string) => {
@@ -24,68 +28,52 @@ export const overrideMessagingFromMainToWindow = (mainDi: DiContainer) => {
       new Map(),
     );
 
-    return getOrInsert<string, ListenerSet>(
-      channelListeners,
-      windowId,
-      new Set(),
-    );
+    return getOrInsertSet(channelListeners, windowId);
   };
 
-  mainDi.override(
-    sendToChannelInElectronBrowserWindowInjectable,
+  return {
+    overrideEnlistForWindow: (windowDi, windowId) => {
+      windowDi.override(
+        enlistMessageChannelListenerInjectableInRenderer,
 
-    () =>
-      (
-        windowId: string,
-        browserWindow,
-        { channel: channelId, frameInfo, data = [] }: SendToViewArgs,
-      ) => {
-        const windowListeners = getWindowListeners(channelId, windowId);
-
-        if (frameInfo) {
-          throw new Error(
-            `Tried to send message to frame "${frameInfo.frameId}" in process "${frameInfo.processId}" using channel "${channelId}" which isn't supported yet.`,
+        () => (listener) => {
+          const windowListeners = getWindowListeners(
+            listener.channel.id,
+            windowId,
           );
-        }
 
-        if (data.length > 1) {
-          throw new Error(
-            `Tried to send message to channel "${channelId}" with more than one argument which is not supported in MessageChannelListener yet.`,
-          );
-        }
+          windowListeners.add(listener);
 
-        if (windowListeners.size === 0) {
-          throw new Error(
-            `Tried to send message to channel "${channelId}" but there where no listeners. Current channels with listeners: "${[
-              ...messageChannelListenerFakesForRenderer.keys(),
-            ].join('", "')}"`,
-          );
-        }
+          return () => {
+            windowListeners.delete(listener);
+          };
+        },
+      );
+    },
+    sendToWindow: (windowId, { channel, data, frameInfo }) => {
+      try {
+        data = deserialize(serialize(data));
+      } catch (error) {
+        throw new Error(`Tried to send a message to channel "${channel}" that is not compatible with StructuredClone: ${error}`);
+      }
 
-        const message = tentativeParseJson(data[0]);
+      const windowListeners = getWindowListeners(channel, windowId);
 
-        windowListeners.forEach((listener) =>
-          listener.handler(message),
+      if (frameInfo) {
+        throw new Error(
+          `Tried to send message to frame "${frameInfo.frameId}" in process "${frameInfo.processId}" using channel "${channel}" which isn't supported yet.`,
         );
-      },
-  );
+      }
 
-  return (windowDi: DiContainer, windowId: string) => {
-    windowDi.override(
-      enlistMessageChannelListenerInjectableInRenderer,
-
-      () => (listener) => {
-        const windowListeners = getWindowListeners(
-          listener.channel.id,
-          windowId,
+      if (windowListeners.size === 0) {
+        throw new Error(
+          `Tried to send message to channel "${channel}" but there where no listeners. Current channels with listeners: "${[
+            ...messageChannelListenerFakesForRenderer.keys(),
+          ].join('", "')}"`,
         );
+      }
 
-        windowListeners.add(listener);
-
-        return () => {
-          windowListeners.delete(listener);
-        };
-      },
-    );
+      windowListeners.forEach((listener) => listener.handler(data));
+    },
   };
 };
diff --git a/src/test-utils/channel-fakes/override-messaging-from-window-to-main.ts b/src/test-utils/channel-fakes/override-messaging-from-window-to-main.ts
index ba6813235b..f00f4e626c 100644
--- a/src/test-utils/channel-fakes/override-messaging-from-window-to-main.ts
+++ b/src/test-utils/channel-fakes/override-messaging-from-window-to-main.ts
@@ -3,54 +3,36 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type { DiContainer } from "@ogre-tools/injectable";
-import assert from "assert";
-import type { MessageChannel } from "../../common/utils/channel/message-channel-injection-token";
-import type { MessageChannelListener } from "../../common/utils/channel/message-channel-listener-injection-token";
+import type { MessageChannel, MessageChannelListener } from "../../common/utils/channel/message-channel-listener-injection-token";
 import enlistMessageChannelListenerInjectableInMain from "../../main/utils/channel/channel-listeners/enlist-message-channel-listener.injectable";
+import { getOrInsertSet } from "../../renderer/utils";
 import sendToMainInjectable from "../../renderer/utils/channel/send-to-main.injectable";
 
 export const overrideMessagingFromWindowToMain = (mainDi: DiContainer) => {
   const messageChannelListenerFakesForMain = new Map<
     string,
-    Set<MessageChannelListener<MessageChannel<any>>>
+    Set<MessageChannelListener<MessageChannel<unknown>>>
   >();
 
   mainDi.override(
     enlistMessageChannelListenerInjectableInMain,
 
     () => (listener) => {
-      const channelId = listener.channel.id;
+      const listeners = getOrInsertSet(messageChannelListenerFakesForMain, listener.channel.id);
 
-      if (!messageChannelListenerFakesForMain.has(channelId)) {
-        messageChannelListenerFakesForMain.set(channelId, new Set());
-      }
-
-      const listeners = messageChannelListenerFakesForMain.get(
-        channelId,
-      );
-
-      assert(listeners);
-
-      // TODO: Figure out typing
-      listeners.add(
-        listener as unknown as MessageChannelListener<MessageChannel<any>>,
-      );
+      listeners.add(listener);
 
       return () => {
-        // TODO: Figure out typing
-        listeners.delete(
-          listener as unknown as MessageChannelListener<MessageChannel<any>>,
-        );
+        listeners.delete(listener);
       };
     },
   );
 
   return (windowDi: DiContainer) => {
     windowDi.override(sendToMainInjectable, () => (channelId, message) => {
-      const listeners =
-        messageChannelListenerFakesForMain.get(channelId) || new Set();
+      const listeners = messageChannelListenerFakesForMain.get(channelId);
 
-      if (listeners.size === 0) {
+      if (!listeners || listeners.size === 0) {
         throw new Error(
           `Tried to send message to channel "${channelId}" but there where no listeners. Current channels with listeners: "${[
             ...messageChannelListenerFakesForMain.keys(),
diff --git a/src/test-utils/channel-fakes/override-requesting-from-window-to-main.ts b/src/test-utils/channel-fakes/override-requesting-from-window-to-main.ts
index 8ee4227289..ddf758f5b6 100644
--- a/src/test-utils/channel-fakes/override-requesting-from-window-to-main.ts
+++ b/src/test-utils/channel-fakes/override-requesting-from-window-to-main.ts
@@ -3,35 +3,29 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type { DiContainer } from "@ogre-tools/injectable";
-import type { RequestChannel } from "../../common/utils/channel/request-channel-injection-token";
-import type { RequestChannelListener } from "../../common/utils/channel/request-channel-listener-injection-token";
+import type { RequestChannel } from "../../common/utils/channel/request-channel-listener-injection-token";
+import type { RequestFromChannel } from "../../common/utils/channel/request-from-channel-injection-token";
 import enlistRequestChannelListenerInjectableInMain from "../../main/utils/channel/channel-listeners/enlist-request-channel-listener.injectable";
+import type { RequestChannelListener } from "../../main/utils/channel/channel-listeners/listener-tokens";
 import requestFromChannelInjectable from "../../renderer/utils/channel/request-from-channel.injectable";
 
 export const overrideRequestingFromWindowToMain = (mainDi: DiContainer) => {
   const requestChannelListenerFakesForMain = new Map<
-      string,
-      RequestChannelListener<RequestChannel<any, any>>
-    >();
+    string,
+    RequestChannelListener<RequestChannel<unknown, unknown>>
+  >();
 
   mainDi.override(
     enlistRequestChannelListenerInjectableInMain,
 
     () => (listener) => {
-      if (requestChannelListenerFakesForMain.get(listener.channel.id)) {
+      if (requestChannelListenerFakesForMain.has(listener.channel.id)) {
         throw new Error(
           `Tried to enlist listener for channel "${listener.channel.id}", but it was already enlisted`,
         );
       }
 
-      requestChannelListenerFakesForMain.set(
-        listener.channel.id,
-
-          // TODO: Figure out typing
-          listener as unknown as RequestChannelListener<
-            RequestChannel<any, any>
-          >,
-      );
+      requestChannelListenerFakesForMain.set(listener.channel.id, listener);
 
       return () => {
         requestChannelListenerFakesForMain.delete(listener.channel.id);
@@ -43,7 +37,7 @@ export const overrideRequestingFromWindowToMain = (mainDi: DiContainer) => {
     windowDi.override(
       requestFromChannelInjectable,
 
-      () => async (channel, ...[request]) => {
+      () => (async (channel, request) => {
         const requestListener = requestChannelListenerFakesForMain.get(channel.id);
 
         if (!requestListener) {
@@ -53,7 +47,7 @@ export const overrideRequestingFromWindowToMain = (mainDi: DiContainer) => {
         }
 
         return requestListener.handler(request);
-      },
+      }) as RequestFromChannel,
     );
   };
 };
diff --git a/src/test-utils/override-fs-with-fakes.ts b/src/test-utils/override-fs-with-fakes.ts
index 1064a36d27..9269eab04e 100644
--- a/src/test-utils/override-fs-with-fakes.ts
+++ b/src/test-utils/override-fs-with-fakes.ts
@@ -7,10 +7,9 @@ import readFileInjectable from "../common/fs/read-file.injectable";
 import writeJsonFileInjectable from "../common/fs/write-json-file.injectable";
 import readJsonFileInjectable from "../common/fs/read-json-file.injectable";
 import pathExistsInjectable from "../common/fs/path-exists.injectable";
+import deleteFileInjectable from "../common/fs/delete-file.injectable";
 
-export const overrideFsWithFakes = (di: DiContainer) => {
-  const state = new Map();
-
+export const overrideFsWithFakes = (di: DiContainer, state = new Map()) => {
   const readFile = readFileFor(state);
 
   di.override(readFileInjectable, () => readFile);
@@ -25,6 +24,9 @@ export const overrideFsWithFakes = (di: DiContainer) => {
   di.override(pathExistsInjectable, () => (
     (filePath: string) => Promise.resolve(state.has(filePath))
   ));
+  di.override(deleteFileInjectable, () => async (filePath: string) => {
+    state.delete(filePath);
+  });
 };
 
 const readFileFor = (state: Map<string, string>) => (filePath: string) => {
diff --git a/src/test-utils/skippers.ts b/src/test-utils/skippers.ts
new file mode 100644
index 0000000000..bd8e094308
--- /dev/null
+++ b/src/test-utils/skippers.ts
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+/**
+ * Conditionally run a test
+ */
+export function itIf(condition: boolean) {
+  return condition ? it : it.skip;
+}
+
+/**
+ * Conditionally run a block of tests
+ */
+export function describeIf(condition: boolean) {
+  return condition ? describe : describe.skip;
+}
diff --git a/templates/create-resource/RuntimeClass.yaml b/templates/create-resource/RuntimeClass.yaml
new file mode 100644
index 0000000000..e0311f1aae
--- /dev/null
+++ b/templates/create-resource/RuntimeClass.yaml
@@ -0,0 +1,12 @@
+apiVersion: node.k8s.io/v1
+kind: RuntimeClass
+metadata:
+  name: spot
+handler: runc
+scheduling:
+  nodeSelector:
+    eks.amazonaws.com/capacityType: "SPOT"
+  tolerations:
+  - key: eks.amazonaws.com/capacityType
+    value: SPOT
+    effect: NoSchedule
diff --git a/troubleshooting/custom-prometheus.md b/troubleshooting/custom-prometheus.md
index 3f9b746394..d0df10fd1d 100644
--- a/troubleshooting/custom-prometheus.md
+++ b/troubleshooting/custom-prometheus.md
@@ -31,14 +31,15 @@ metricRelabelings:
 
 ### Jsonnet
 
-The required label replacements are bundled in [jsonnet/lens/custom-prometheus](../jsonnet/lens/custom-prometheus.jsonnet). To install it copy the file or use
-[Jsonnet Bundler](https://github.com/jsonnet-bundler/jsonnet-bundler).
+The required label replacements are bundled in [jsonnet/lens/custom-prometheus](../jsonnet/lens/custom-prometheus.jsonnet).
+This file is currently for jsonnet versions >= 0.8.0
+To install it copy the file or use [Jsonnet Bundler](https://github.com/jsonnet-bundler/jsonnet-bundler).
 
 ```bash
 jb init && jb install https://github.com/lensapp/lens/jsonnet/lens@master
 ```
 
-When the installation was successful include it into your definitions. Using the [example](https://github.com/coreos/kube-prometheus#compiling) 
+When the installation was successful include it into your definitions. Using the [example](https://github.com/coreos/kube-prometheus#compiling)
 of kube-prometheus, e.g.:
 
 ```
@@ -60,4 +61,3 @@ local kp =
 ```
 helm upgrade --set server.global.scrape_interval=30s prometheus stable/prometheus
 ```
-
diff --git a/types/dom.d.ts b/types/dom.d.ts
index 0e3e1bcb43..04e99babcd 100644
--- a/types/dom.d.ts
+++ b/types/dom.d.ts
@@ -8,9 +8,4 @@ declare global {
   interface Element {
     scrollIntoViewIfNeeded?(opt_center?: boolean): void;
   }
-
-  interface Window {
-    requestIdleCallback(callback: () => void, options: { timeout: number });
-    cancelIdleCallback(callback: () => void);
-  }
 }
diff --git a/types/from-webpack.d.ts b/types/from-webpack.d.ts
new file mode 100644
index 0000000000..c0b5439355
--- /dev/null
+++ b/types/from-webpack.d.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+// These variables will be replaced by webpack at compile time
+declare const CONTEXT_MATCHER_FOR_NON_FEATURES: RegExp;
+declare const CONTEXT_MATCHER_FOR_FEATURES: RegExp;
diff --git a/types/mocks.d.ts b/types/mocks.d.ts
index fd01e929d6..3826aac829 100644
--- a/types/mocks.d.ts
+++ b/types/mocks.d.ts
@@ -2,7 +2,6 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-declare module "mac-ca"
 declare module "win-ca"
 declare module "win-ca/api"
 
diff --git a/webpack/dev-server.ts b/webpack/dev-server.ts
index d4d62ddb0c..68fd72bb35 100644
--- a/webpack/dev-server.ts
+++ b/webpack/dev-server.ts
@@ -6,7 +6,6 @@
 import Webpack from "webpack";
 import WebpackDevServer from "webpack-dev-server";
 import { webpackLensRenderer } from "./renderer";
-import logger from "../src/common/logger";
 import { buildDir, webpackDevServerPort } from "./vars";
 
 /**
@@ -42,6 +41,6 @@ const server = new WebpackDevServer({
   },
 }, compiler);
 
-logger.info(`[WEBPACK-DEV-SERVER]: created with options`, server.options);
+console.info(`[WEBPACK-DEV-SERVER]: created with options`, server.options);
 
 server.start();
diff --git a/webpack/main.ts b/webpack/main.ts
index 397ffb2968..84efd63f22 100755
--- a/webpack/main.ts
+++ b/webpack/main.ts
@@ -11,7 +11,9 @@ import getTypeScriptLoader from "./get-typescript-loader";
 import CircularDependencyPlugin from "circular-dependency-plugin";
 import { iconsAndImagesWebpackRules } from "./renderer";
 import type { WebpackPluginInstance } from "webpack";
+import { DefinePlugin } from "webpack";
 import { buildDir, isDevelopment, mainDir } from "./vars";
+import { platform } from "process";
 
 const configs: { (): webpack.Configuration }[] = [];
 
@@ -53,6 +55,10 @@ configs.push((): webpack.Configuration => {
       ],
     },
     plugins: [
+      new DefinePlugin({
+        CONTEXT_MATCHER_FOR_NON_FEATURES: `/\\.injectable(\\.${platform})?\\.tsx?$/`,
+        CONTEXT_MATCHER_FOR_FEATURES: `/\\/(main|common)\\/.+\\.injectable(\\.${platform})?\\.tsx?$/`,
+      }),
       new ForkTsCheckerPlugin(),
       new CircularDependencyPlugin({
         cwd: __dirname,
diff --git a/webpack/node-fetch.ts b/webpack/node-fetch.ts
new file mode 100644
index 0000000000..1db909889d
--- /dev/null
+++ b/webpack/node-fetch.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import path from "path";
+
+export default {
+  entry: "./node_modules/node-fetch/src/index.js",
+  output: {
+    path: path.resolve(__dirname, "..", "build", "webpack"),
+    filename: "node-fetch.bundle.js",
+    library: {
+      name: "NodeFetch",
+      type: "commonjs",
+    },
+    clean: true,
+    asyncChunks: false, // This is required so that only one file is created
+  },
+  mode: "production",
+  target: "electron-renderer",
+  optimization: {
+    concatenateModules: true,
+    minimize: true,
+  },
+  externalsPresets: {
+    node: true,
+  },
+  resolve: {
+    extensions: [".js"],
+  },
+};
diff --git a/webpack/renderer.ts b/webpack/renderer.ts
index c8c87e856f..6bad203ca7 100755
--- a/webpack/renderer.ts
+++ b/webpack/renderer.ts
@@ -12,8 +12,10 @@ import MonacoWebpackPlugin from "monaco-editor-webpack-plugin";
 import CircularDependencyPlugin from "circular-dependency-plugin";
 import ReactRefreshWebpackPlugin from "@pmmmwh/react-refresh-webpack-plugin";
 import type { WebpackPluginInstance } from "webpack";
+import { DefinePlugin } from "webpack";
 import getTypescriptLoader from "./get-typescript-loader";
 import { assetsFolderName, isDevelopment, rendererDir, buildDir, appName, htmlTemplate, publicPath, sassCommonVars } from "./vars";
+import { platform } from "process";
 
 export function webpackLensRenderer({ showVars = true } = {}): webpack.Configuration {
   if (showVars) {
@@ -85,6 +87,10 @@ export function webpackLensRenderer({ showVars = true } = {}): webpack.Configura
     },
 
     plugins: [
+      new DefinePlugin({
+        CONTEXT_MATCHER_FOR_NON_FEATURES: `/\\.injectable(\\.${platform})?\\.tsx?$/`,
+        CONTEXT_MATCHER_FOR_FEATURES: `/\\/(renderer|common)\\/.+\\.injectable(\\.${platform})?\\.tsx?$/`,
+      }),
       new ForkTsCheckerPlugin(),
 
       // see also: https://github.com/Microsoft/monaco-editor-webpack-plugin#options
diff --git a/yarn.lock b/yarn.lock
index 8b7932115a..a92d814814 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -383,7 +383,7 @@
     core-js-pure "^3.20.2"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.15.4", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.15.4", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72"
   integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==
@@ -598,15 +598,20 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
   integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
 
-"@esbuild/linux-loong64@0.15.7":
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.7.tgz#1ec4af4a16c554cbd402cc557ccdd874e3f7be53"
-  integrity sha512-IKznSJOsVUuyt7cDzzSZyqBEcZe+7WlBqTVXiF1OXP/4Nm387ToaXZ0fyLwI1iBlI/bzpxVq411QE2/Bt2XWWw==
+"@esbuild/android-arm@0.15.15":
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.15.tgz#35b3cc0f9e69cb53932d44f60b99dd440335d2f0"
+  integrity sha512-JJjZjJi2eBL01QJuWjfCdZxcIgot+VoK6Fq7eKF9w4YHm9hwl7nhBR1o2Wnt/WcANk5l9SkpvrldW1PLuXxcbw==
 
-"@eslint/eslintrc@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.1.tgz#de0807bfeffc37b964a7d0400e0c348ce5a2543d"
-  integrity sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==
+"@esbuild/linux-loong64@0.15.15":
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.15.tgz#32c65517a09320b62530867345222fde7794fbe1"
+  integrity sha512-lhz6UNPMDXUhtXSulw8XlFAtSYO26WmHQnCi2Lg2p+/TMiJKNLtZCYUxV4wG6rZMzXmr8InGpNwk+DLT2Hm0PA==
+
+"@eslint/eslintrc@^1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95"
+  integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -618,6 +623,18 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@floating-ui/core@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.0.1.tgz#00e64d74e911602c8533957af0cce5af6b2e93c8"
+  integrity sha512-bO37brCPfteXQfFY0DyNDGB3+IMe4j150KFQcgJ5aBP295p9nBGeHEs/p0czrRbtlHq4Px/yoPXO/+dOCcF4uA==
+
+"@floating-ui/dom@^1.0.1":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.0.2.tgz#c5184c52c6f50abd11052d71204f4be2d9245237"
+  integrity sha512-5X9WSvZ8/fjy3gDu8yx9HAA4KG1lazUN2P4/VnaXLxTO9Dz53HI1oYoh1OlhqFNlHgGDiwFX5WhFCc2ljbW3yA==
+  dependencies:
+    "@floating-ui/core" "^1.0.1"
+
 "@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
@@ -734,20 +751,15 @@
     "@hapi/bourne" "2.x.x"
     "@hapi/hoek" "9.x.x"
 
-"@humanwhocodes/config-array@^0.10.4":
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.4.tgz#01e7366e57d2ad104feea63e72248f22015c520c"
-  integrity sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==
+"@humanwhocodes/config-array@^0.11.6":
+  version "0.11.6"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.6.tgz#6a51d603a3aaf8d4cf45b42b3f2ac9318a4adc4b"
+  integrity sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
     minimatch "^3.0.4"
 
-"@humanwhocodes/gitignore-to-minimatch@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
-  integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
-
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
@@ -1062,24 +1074,16 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@kubernetes/client-node@^0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@kubernetes/client-node/-/client-node-0.17.0.tgz#cbf69ff6c8a311c1461275169612ac46db00fe3f"
-  integrity sha512-oKQfRf7RPpJIF2Ft92g6jefbW3Mddf6IzcfpBNDWrAy66LmyAWds6fQTMsdutGPuXV6KD29u6RfM3rdzddGMIA==
+"@kubernetes/client-node@^0.17.1":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@kubernetes/client-node/-/client-node-0.17.1.tgz#a5740712848d77823e7d0eee70229936398b4142"
+  integrity sha512-qXANjukuTq/drb1hq1NCYZafpdRTvbyTzbliWO6RwW7eEb2b9qwINbw0DiVHpBQg3e9DeQd8+brI1sR1Fck5kQ==
   dependencies:
-    "@types/js-yaml" "^4.0.1"
-    "@types/node" "^10.12.0"
-    "@types/request" "^2.47.1"
-    "@types/stream-buffers" "^3.0.3"
-    "@types/tar" "^4.0.3"
-    "@types/underscore" "^1.8.9"
-    "@types/ws" "^6.0.1"
     byline "^5.0.0"
     execa "5.0.0"
     isomorphic-ws "^4.0.1"
     js-yaml "^4.1.0"
     jsonpath-plus "^0.19.0"
-    openid-client "^5.1.6"
     request "^2.88.0"
     rfc4648 "^1.3.0"
     shelljs "^0.8.5"
@@ -1089,6 +1093,8 @@
     tslib "^1.9.3"
     underscore "^1.9.1"
     ws "^7.3.1"
+  optionalDependencies:
+    openid-client "^5.1.6"
 
 "@leichtgewicht/ip-codec@^2.0.1":
   version "2.0.4"
@@ -1207,7 +1213,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -1215,10 +1221,10 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/arborist@^5.6.1":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-5.6.1.tgz#8371fe6e38f2d9ebc57a77be9ac0a8276564aa07"
-  integrity sha512-bFEihRTSzIpJY+EJjyUUiTHkuZfFyn6ROlPzyVVDsHmysN8JRZ0LdgA/cwNuTGndb1ddsUxhSENhLp5pJHhX3Q==
+"@npmcli/arborist@^5.6.3":
+  version "5.6.3"
+  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-5.6.3.tgz#40810080272e097b4a7a4f56108f4a31638a9874"
+  integrity sha512-/7hbqEM6YuRjwTcQXkK1+xKslEblY5kFQe0tZ7jKyMlIR6x4iOmhLErIkBBGtTKvYxRKdpcxnFXjCobg3UqmsA==
   dependencies:
     "@isaacs/string-locale-compare" "^1.1.0"
     "@npmcli/installed-package-contents" "^1.0.7"
@@ -1233,6 +1239,7 @@
     bin-links "^3.0.3"
     cacache "^16.1.3"
     common-ancestor-path "^1.0.1"
+    hosted-git-info "^5.2.1"
     json-parse-even-better-errors "^2.3.1"
     json-stringify-nice "^1.1.4"
     minimatch "^5.1.0"
@@ -1402,60 +1409,55 @@
     read-package-json-fast "^2.0.3"
     which "^2.0.2"
 
-"@ogre-tools/fp@10.1.0", "@ogre-tools/fp@^10.1.0":
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-10.1.0.tgz#e83c4dad97416c62d89913c0c0a34e734ae06b8b"
-  integrity sha512-ZqGQXytucSWbSoNjrdyHAiIWO0LotxBU+aI5hCcqedWg9TzNzf78YKD6ngHXxVEwT/JYsslxXMxzE4LNdo8Cbg==
-  dependencies:
-    lodash "^4.17.21"
+"@ogre-tools/fp@^12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-12.0.1.tgz#1f932c8c4cc04075f92ab5ca564db158ac1514d4"
+  integrity sha512-BzMhkI4wPnuI+hXJDbtHUXQn/uBjJLx3W0oDaIFV+lLpkneUU0oW9D5uZFHNOouzCgf67/tnmUC6Ohevbr7/VA==
 
-"@ogre-tools/injectable-extension-for-auto-registration@10.1.0":
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-auto-registration/-/injectable-extension-for-auto-registration-10.1.0.tgz#a46d23cf5cf880e416a46238ecb54e7f933f9d89"
-  integrity sha512-G9UKcaYr4DHViXHIKigzy6jI2ZhQC+K6idc1M4W/l4IazaV26Gwj1MSI5nrJ6Z4aRAzILFKM4dzkvZNFjkyGrw==
-  dependencies:
-    "@ogre-tools/fp" "^10.1.0"
-    "@ogre-tools/injectable" "^10.1.0"
-    lodash "^4.17.21"
+"@ogre-tools/injectable-extension-for-auto-registration@^12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-auto-registration/-/injectable-extension-for-auto-registration-12.0.1.tgz#878f73b5408b12193664f4920289905eacb4c1cc"
+  integrity sha512-itKcxEJ/J8SKGD/Wwj0UYOA+/nqwnrwanhikY6qhlibj8guujX77Iip7vMBzJFc2nIrRaQRcpNV2eXe+tjQUdg==
 
-"@ogre-tools/injectable-extension-for-mobx@10.1.0":
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-mobx/-/injectable-extension-for-mobx-10.1.0.tgz#b1efaafb048f2ceb5588daad708dbeffbd2ec7d1"
-  integrity sha512-G5A6FSgBMTlD6Qdd6xzeuVzcyHGS+tTUW7DCBbYLJqZ3Y8/PprSomhunrNrrcuZdM0K16BpQT8o6OHw4Z/Kqiw==
-  dependencies:
-    "@ogre-tools/fp" "^10.1.0"
-    "@ogre-tools/injectable" "^10.1.0"
-    lodash "^4.17.21"
+"@ogre-tools/injectable-extension-for-mobx@^12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-mobx/-/injectable-extension-for-mobx-12.0.1.tgz#1e9de8caba076d7cebda4177a5ab763594b08b28"
+  integrity sha512-M1penOpZfO3/rJMb6WN4IL86p9Lx9tOMCipiNkAyitNLGWfeDPG279JlCs9E3Uw8R9nkFPiw8Je2SLnwnM9o+A==
 
-"@ogre-tools/injectable-react@10.1.0":
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-10.1.0.tgz#5c9b4b5eb9e5843cc966629131104055180ba18c"
-  integrity sha512-4ReLJm8QcruCEm4KFhbsXLki3YiKRwlg3Mg7C2d8KyUfg+MUA5VdvgQSn3HthnyejiXlYCinqJLw83IryX/GNA==
-  dependencies:
-    "@ogre-tools/fp" "^10.1.0"
-    "@ogre-tools/injectable" "^10.1.0"
-    lodash "^4.17.21"
+"@ogre-tools/injectable-react@^12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-12.0.1.tgz#07a43f25bd78db37cb2c00bc0c06e0a69394f519"
+  integrity sha512-LAOh/EHKqk/pQcBRZUAz0VcJwgBeIPxHwlV/Apw0aEBBoMuYLsLZh47rES8sMYMV6N5x7oVfkjMscujY0DCgaQ==
 
-"@ogre-tools/injectable@10.1.0", "@ogre-tools/injectable@^10.1.0":
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-10.1.0.tgz#5051cc6a673576028e00439fc3e3f053ecdda030"
-  integrity sha512-7h7P5nfAFqnSny341FFT6cbJCmXVlGqA4zwTOpwKsGyC1h90NWtQZ+PUxY5MKl7rFWW/wpXgAKQqtf27Vy41Qw==
-  dependencies:
-    "@ogre-tools/fp" "^10.1.0"
-    lodash "^4.17.21"
+"@ogre-tools/injectable@^12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-12.0.1.tgz#53f9981f7f165da4277857b8338cc4097d357ad2"
+  integrity sha512-uOx8STN2wSc9hknDSTGqViyR89Vwg7rGacwrVNchgyo48/QJsmZZz6cd1Aw3nT4vr7ekjTc2lh0Rz6zGIv47hg==
 
-"@pmmmwh/react-refresh-webpack-plugin@^0.5.7":
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.7.tgz#58f8217ba70069cc6a73f5d7e05e85b458c150e2"
-  integrity sha512-bcKCAzF0DV2IIROp9ZHkRJa6O4jy7NlnHdWL3GmcUxYWNjLXkK5kfELELwEfSP5hXPfVL/qOGMAROuMQb9GG8Q==
+"@pkgr/utils@^2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.3.1.tgz#0a9b06ffddee364d6642b3cd562ca76f55b34a03"
+  integrity sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==
+  dependencies:
+    cross-spawn "^7.0.3"
+    is-glob "^4.0.3"
+    open "^8.4.0"
+    picocolors "^1.0.0"
+    tiny-glob "^0.2.9"
+    tslib "^2.4.0"
+
+"@pmmmwh/react-refresh-webpack-plugin@^0.5.10":
+  version "0.5.10"
+  resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz#2eba163b8e7dbabb4ce3609ab5e32ab63dda3ef8"
+  integrity sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==
   dependencies:
     ansi-html-community "^0.0.8"
     common-path-prefix "^3.0.0"
-    core-js-pure "^3.8.1"
+    core-js-pure "^3.23.3"
     error-stack-parser "^2.0.6"
     find-up "^5.0.0"
     html-entities "^2.1.0"
-    loader-utils "^2.0.0"
+    loader-utils "^2.0.4"
     schema-utils "^3.0.0"
     source-map "^0.7.3"
 
@@ -1480,10 +1482,10 @@
     "@sentry/utils" "6.19.2"
     tslib "^1.9.3"
 
-"@sentry/electron@^3.0.7":
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-3.0.7.tgz#d32ebd27d7fc9b0e7e8dd8498ee797fcaafb5a13"
-  integrity sha512-Rahi1jgvjHnx1jGkkPPvDCxSCAME7xc2eBcFCLb4R/WDuNblR7tgJUuAtzv9JpxUgRHy1oLNct0wcvIu1mcXoA==
+"@sentry/electron@^3.0.8":
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-3.0.8.tgz#ad4aaa0290c31fb5eb3ed06377da46ee501ec97d"
+  integrity sha512-D330t0rRswAYreFtzIICD5uQH7Wp2e7g6GEFTGisTouHY9+qSu7q9J/hGe5Vase5cY5277/YmUaUKRrVxj/2DQ==
   dependencies:
     "@sentry/browser" "6.19.2"
     "@sentry/core" "6.19.2"
@@ -1622,118 +1624,79 @@
     slash "3.0.0"
     source-map "^0.7.3"
 
-"@swc/core-android-arm-eabi@1.2.249":
-  version "1.2.249"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.249.tgz#3aa864f15f47e5f66886a2a6cf838a93813cbb38"
-  integrity sha512-iOcGLHCsqZHQWGmgLEzagkRct40S3MjVBPQ/swR5kHUZef+//pjGyrr3RVyrp7bxb1Q0RaIKM8iZEvBiG6NGmw==
-  dependencies:
-    "@swc/wasm" "1.2.122"
+"@swc/core-darwin-arm64@1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.19.tgz#cc0836ce73fe4c41dd75793cc83d74a4c6917aa9"
+  integrity sha512-6xLtmXzS4nNWGQkajbiAjGXspUJfxS2IWoGQ16J9nfOFdttKyoIG5o5+mxUfKeg5bXw9cI+r675kN/irx3z7MQ==
 
-"@swc/core-android-arm64@1.2.249":
-  version "1.2.249"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.249.tgz#ee3435379b399f2ca651ba99c2ca380518a31e41"
-  integrity sha512-SraLJ+Vaa8sP/V+gWFVQEKO4QzRVOu8/Df4JYzGj+qEAxsUjE4sIigCyDtYhOvv3hW4Rm8iABJ7me0obRhV6PA==
-  dependencies:
-    "@swc/wasm" "1.2.130"
+"@swc/core-darwin-x64@1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.19.tgz#4ae28e4cff562603deadc67d1b262b87d31a7694"
+  integrity sha512-qCDQcngYBeWrsNS1kcBslRD0dahKcYKaUUWRC9yHpRcs3SRvnSpJyWQR4y9RCdO9YNmixJ9+5+zPD9qcgL7jBw==
 
-"@swc/core-darwin-arm64@1.2.249":
-  version "1.2.249"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.249.tgz#99220e1e10bf02728e9ca3bed31c3b0d634dc9aa"
-  integrity sha512-nlS9wX0tnq1DGv+I8h/KF3SuqZbn5B/+EDq3m88jE/X8RVNFTXkbO10nKQaXkPIEwOzUX3ImQoa070B/P4Gdhw==
+"@swc/core-linux-arm-gnueabihf@1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.19.tgz#7260b4bbfd2d361beade84476c950dbde1f16f7d"
+  integrity sha512-ufbKW6Lhii1+kVCXnsHgqYIpRvXhPjdhMudfP4KKVgJtT6TsdEIr+KRAQIBHLjRUsTKA2DLsGEpu9jfjwFiNEg==
 
-"@swc/core-darwin-x64@1.2.249":
-  version "1.2.249"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.249.tgz#578ea5854603985bf3bcd15ffed71f20d96e1f63"
-  integrity sha512-myWcyqp541emXd+bLQ2G6fL7elpsO9D/r04ImvgPrNoESe2UhvkhXQ6T548nxg5qNprSzFRYQGOdD8ydaQSWKg==
+"@swc/core-linux-arm64-gnu@1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.19.tgz#702e25ec9cd9a33ce866900c567224544a593f3a"
+  integrity sha512-HHhqLRZv9Ss8orJrlEP4XRcLuqLDwFtGgbtHU8kyWBmQEtK42uT18Pf5RJBo5sPJHY8m5EO8C8y3hIbGmKtLyg==
 
-"@swc/core-freebsd-x64@1.2.249":
-  version "1.2.249"
-  resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.249.tgz#795349a9a85fef86f080e2b5ce39f4ba770ad44c"
-  integrity sha512-f2ahMbHGGAjGbDeKcsKed2oiW68hMJtBZaH0DUrg/VbDE9lkiIEdmU/Qpb1eDJjOtEpm1V47OTAeOpcJm3Fo3g==
-  dependencies:
-    "@swc/wasm" "1.2.130"
+"@swc/core-linux-arm64-musl@1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.19.tgz#7e38a9aa4ea5233caafd10108213b6ca2f005f4d"
+  integrity sha512-vipnF3C6T1368uHQqz8RpdszWxxGh0X8VBK3TdTOSWvI/duNZtZXEOZlB2Nh9w+u09umVw0MsJhvg86Aon39mA==
 
-"@swc/core-linux-arm-gnueabihf@1.2.249":
-  version "1.2.249"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.249.tgz#09433f7df8b8ec6b2543121e7ff50403d5ad0cd9"
-  integrity sha512-RMcvTRSGhWBVRZbHT2wip4GSC8PiN9OtQqz0rcQw7uPfYKcaRKN/7b4HmJvuN1u6WDx+loq+GmnvN8ncLD3aXA==
-  dependencies:
-    "@swc/wasm" "1.2.130"
+"@swc/core-linux-x64-gnu@1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.19.tgz#ad21e8f3f3f9099ae669b46d27873e671cdebe59"
+  integrity sha512-dUbq8mnIqBhU7OppfY3ncOvl26691WFGxd97QtnnlfMZrKnaofKFMIxE9sTHOLSbBo16AylnEMiwa45w2UWDEg==
 
-"@swc/core-linux-arm64-gnu@1.2.249":
-  version "1.2.249"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.249.tgz#20585c96b1d9419632303afec33130bae9612db3"
-  integrity sha512-EErpv+SZK5mqoKnhxw2VSW7QsGgeYVV7UL4XgfOxLUqDLXq8W/WDgsnhLsj+D8SSOIxFKRGnM6A3Au/XHwTV4w==
+"@swc/core-linux-x64-musl@1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.19.tgz#265eee4872c8407c52cb902ded72a44a57690352"
+  integrity sha512-RiVZrlkNGcj9jZyjF7YFOW3fj9fWPC25AYkknLpWxAmLQcp1piAWj+aSixmMWUC4QJau78VZzcm+kRgIOECALw==
 
-"@swc/core-linux-arm64-musl@1.2.249":
-  version "1.2.249"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.249.tgz#300a77db97a56f7fbd705425fa737451dd1fa681"
-  integrity sha512-5ig/Aju0yP9ljBeqCGsxBCAZRVBNPVFUroxv51hAWk5ji0CIROctfWH4NkpsJqC9AyGxZPw3Q/cqzUe5o0Gc5A==
+"@swc/core-win32-arm64-msvc@1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.19.tgz#5c41648fe99b310e35c11f685e272539c5c2b704"
+  integrity sha512-r2U6GC+go2iiLx5JBZIJswYFiMv0yOsm+pgE1srVvAc8dP02320t9yh0Uj4Sr2hDipTWJ33Y5PMZwEsZSfBVbQ==
 
-"@swc/core-linux-x64-gnu@1.2.249":
-  version "1.2.249"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.249.tgz#5b684c4b43625ce3a970df6d25094f22686f1430"
-  integrity sha512-lE9uzEXj0f4Qw53yHTf5j0hH2WgwbQstTamaUBFHGXGAUlqhSMJW9Yc1pvejbDD1VAADCeqc1eSNH3aihMRP4A==
+"@swc/core-win32-ia32-msvc@1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.19.tgz#022b174e6e79d97286893223af990bd8281768ae"
+  integrity sha512-SPpESDa4vr0PRvUiqXSi8oZSTmkDOGrZ/pSiLD7ISgjsQ5RQMbPkuEK0ztWljim87q2fO0bGVVhyaVYxdOVS1A==
 
-"@swc/core-linux-x64-musl@1.2.249":
-  version "1.2.249"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.249.tgz#66d02bce7df54386947b68296e934c7029a14f5a"
-  integrity sha512-2hiUkpRgGXEJz2+SoaZIRUuPWeBKj3PH28fN0WR9HIqbglU8gKr3LHyQKbx8SRBosYeSbRSFknw44ucK7IY9rQ==
+"@swc/core-win32-x64-msvc@1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.19.tgz#1e5eadef26da360314c29b951e5da8b84ee9bcad"
+  integrity sha512-0X5HqFC1wQlheOQDZeF6KNOSURZKkGISNK3aTSmTq9g7dDJ/kTcVjsdKbu2rK4ibCnlC9IS0cLK9FpROnsVPwA==
 
-"@swc/core-win32-arm64-msvc@1.2.249":
-  version "1.2.249"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.249.tgz#d77dcf2ab4627465b936d9afce320d1e6dcd81bd"
-  integrity sha512-lP8Gvqnj6FSnJpNkR06yd522CUS3HbS7D1ZWhxlr7xy2xB9bmQhQL3CloZONVRBU+0vvwE54p4k5X6/oJus+qQ==
-  dependencies:
-    "@swc/wasm" "1.2.130"
-
-"@swc/core-win32-ia32-msvc@1.2.249":
-  version "1.2.249"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.249.tgz#98305c32d6ce6114be0980542075477aed1843d9"
-  integrity sha512-zm4Wj1cvmiBHShRhX33hSzI/I7FctWA6svxlsx1zEQmTtKSqUqEKoswy/XUNsJ9p6Knf9INLPItfv/7HI/Eqaw==
-  dependencies:
-    "@swc/wasm" "1.2.130"
-
-"@swc/core-win32-x64-msvc@1.2.249":
-  version "1.2.249"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.249.tgz#0b3eb647a285ec94d17230f13c3bf0299ef41913"
-  integrity sha512-IxRvePerNYVJXr6lk0P09y1XAqPncMHWWvWm7p3CvTAfxEuiM5DqD5wtIbFMXfPSi1TTSkzAqBoH6Nushvgb3Q==
-
-"@swc/core@^1.2.249":
-  version "1.2.249"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.249.tgz#5fb1e2654fadadb7bc1b846f77627a92f36d174b"
-  integrity sha512-aXAoNQLfba/3YcR6wdBM21Gp3q+G6Ay9Ey+BZHOBGW5amewzd84WYKIMoIc4fZhFj9dv6UaUu3B9qD+4oP/zhg==
+"@swc/core@^1.3.19":
+  version "1.3.19"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.19.tgz#07836fb4a6e0a10a77a8144887aef8ded3b84578"
+  integrity sha512-KiXUv2vpmOaGhoLCN9Rw7Crsfq1YmOR2ZbajiqNAh/iu0d3CKn5JZhLRs6S7nCk78cwFFac2obQfTWPePLUe/g==
   optionalDependencies:
-    "@swc/core-android-arm-eabi" "1.2.249"
-    "@swc/core-android-arm64" "1.2.249"
-    "@swc/core-darwin-arm64" "1.2.249"
-    "@swc/core-darwin-x64" "1.2.249"
-    "@swc/core-freebsd-x64" "1.2.249"
-    "@swc/core-linux-arm-gnueabihf" "1.2.249"
-    "@swc/core-linux-arm64-gnu" "1.2.249"
-    "@swc/core-linux-arm64-musl" "1.2.249"
-    "@swc/core-linux-x64-gnu" "1.2.249"
-    "@swc/core-linux-x64-musl" "1.2.249"
-    "@swc/core-win32-arm64-msvc" "1.2.249"
-    "@swc/core-win32-ia32-msvc" "1.2.249"
-    "@swc/core-win32-x64-msvc" "1.2.249"
+    "@swc/core-darwin-arm64" "1.3.19"
+    "@swc/core-darwin-x64" "1.3.19"
+    "@swc/core-linux-arm-gnueabihf" "1.3.19"
+    "@swc/core-linux-arm64-gnu" "1.3.19"
+    "@swc/core-linux-arm64-musl" "1.3.19"
+    "@swc/core-linux-x64-gnu" "1.3.19"
+    "@swc/core-linux-x64-musl" "1.3.19"
+    "@swc/core-win32-arm64-msvc" "1.3.19"
+    "@swc/core-win32-ia32-msvc" "1.3.19"
+    "@swc/core-win32-x64-msvc" "1.3.19"
 
-"@swc/jest@^0.2.22":
-  version "0.2.22"
-  resolved "https://registry.yarnpkg.com/@swc/jest/-/jest-0.2.22.tgz#70d02ac648c21a442016d7a0aa485577335a4c9a"
-  integrity sha512-PIUIk9IdB1oAVfF9zNIfYoMBoEhahrrSvyryFANas7swC1cF0L5HR0f9X4qfet46oyCHCBtNcSpN0XJEOFIKlw==
+"@swc/jest@^0.2.23":
+  version "0.2.23"
+  resolved "https://registry.yarnpkg.com/@swc/jest/-/jest-0.2.23.tgz#0b7499d5927faaa090c5b7a4a0e35122968fef30"
+  integrity sha512-ZLj17XjHbPtNsgqjm83qizENw05emLkKGu3WuPUttcy9hkngl0/kcc7fDbcSBpADS0GUtsO+iKPjZFWVAtJSlA==
   dependencies:
     "@jest/create-cache-key-function" "^27.4.2"
-
-"@swc/wasm@1.2.122":
-  version "1.2.122"
-  resolved "https://registry.yarnpkg.com/@swc/wasm/-/wasm-1.2.122.tgz#87a5e654b26a71b2e84b801f41e45f823b856639"
-  integrity sha512-sM1VCWQxmNhFtdxME+8UXNyPNhxNu7zdb6ikWpz0YKAQQFRGT5ThZgJrubEpah335SUToNg8pkdDF7ibVCjxbQ==
-
-"@swc/wasm@1.2.130":
-  version "1.2.130"
-  resolved "https://registry.yarnpkg.com/@swc/wasm/-/wasm-1.2.130.tgz#88ac26433335d1f957162a9a92f1450b73c176a0"
-  integrity sha512-rNcJsBxS70+pv8YUWwf5fRlWX6JoY/HJc25HD/F8m6Kv7XhJdqPPMhyX6TKkUBPAG7TWlZYoxa+rHAjPy4Cj3Q==
+    jsonc-parser "^3.2.0"
 
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
@@ -2006,10 +1969,10 @@
   dependencies:
     "@types/ms" "*"
 
-"@types/dompurify@^2.3.4":
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.3.4.tgz#94e997e30338ea24d4c8d08beca91ce4dd17a1b4"
-  integrity sha512-EXzDatIb5EspL2eb/xPGmaC8pePcTHrkDCONjeisusLFrVfl38Pjea/R0YJGu3k9ZQadSvMqW0WXPI2hEo2Ajg==
+"@types/dompurify@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.4.0.tgz#fd9706392a88e0e0e6d367f3588482d817df0ab9"
+  integrity sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg==
   dependencies:
     "@types/trusted-types" "*"
 
@@ -2113,13 +2076,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/history@*":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@types/history/-/history-5.0.0.tgz#29f919f0c8e302763798118f45b19cab4a886f14"
-  integrity sha512-hy8b7Y1J8OGe6LbAjj3xniQrj3v6lsivCcrmf4TzSgPzLkhIeKgc5IZnT7ReIqmEuodjfO8EYAuoFvIrHi/+jQ==
-  dependencies:
-    history "*"
-
 "@types/history@^4.7.11", "@types/history@^4.7.8":
   version "4.7.11"
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64"
@@ -2195,7 +2151,7 @@
     jest-matcher-utils "^28.0.0"
     pretty-format "^28.0.0"
 
-"@types/js-yaml@^4.0.1", "@types/js-yaml@^4.0.5":
+"@types/js-yaml@^4.0.5":
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.5.tgz#738dd390a6ecc5442f35e7f03fa1431353f7e138"
   integrity sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==
@@ -2231,10 +2187,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/lodash@^4.14.184":
-  version "4.14.184"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.184.tgz#23f96cd2a21a28e106dc24d825d4aa966de7a9fe"
-  integrity sha512-RoZphVtHbxPZizt4IcILciSWiC6dcn+eZ8oX9IWEYfDMcocdd42f7NPI6fQj+6zI8y4E0L7gu2pcZKLGTRaV9Q==
+"@types/lodash@^4.14.190":
+  version "4.14.190"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.190.tgz#d8e99647af141c63902d0ca53cf2b34d2df33545"
+  integrity sha512-5iJ3FBJBvQHQ8sFhEhJfjUP+G+LalhavTkYyrAYqz5MEJG+erSv0k9KJLb6q7++17Lafk1scaTIFXcMJlwK8Mw==
 
 "@types/marked@^4.0.7":
   version "4.0.7"
@@ -2246,6 +2202,13 @@
   resolved "https://registry.yarnpkg.com/@types/md5-file/-/md5-file-4.0.2.tgz#c7241e88f4aa17218c774befb0fc34f33f21fe36"
   integrity sha512-8gacRfEqLrmZ6KofpFfxyjsm/LYepeWUWUJGaf5A9W9J5B2/dRZMdkDqFDL6YDa9IweH12IO76jO7mpsK2B3wg==
 
+"@types/memorystream@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@types/memorystream/-/memorystream-0.3.0.tgz#7616df4c42a479805d052a058d990b879d5e368f"
+  integrity sha512-gzh6mqZcLryYHn4g2MuMWjo9J1+Py/XYwITyZmUxV7ZoBIi7bTbBgSiuC5tcm3UL3gmaiYssQFDlXr/3fK94cw==
+  dependencies:
+    "@types/node" "*"
+
 "@types/mime@^1":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
@@ -2263,13 +2226,6 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
-"@types/minipass@*":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@types/minipass/-/minipass-3.1.2.tgz#e2d7f9df0698aff421dcf145b4fc05b8183b9030"
-  integrity sha512-foLGjgrJkUjLG/o2t2ymlZGEoBNBa/TfoUZ7oCTkOjP1T43UGBJspovJou/l3ZuHvye2ewR5cZNtp2zyWgILMA==
-  dependencies:
-    "@types/node" "*"
-
 "@types/mkdirp@^1.0.0":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-1.0.2.tgz#8d0bad7aa793abe551860be1f7ae7f3198c16666"
@@ -2289,35 +2245,15 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
-"@types/node-fetch@^2.6.2":
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da"
-  integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==
-  dependencies:
-    "@types/node" "*"
-    form-data "^3.0.0"
-
 "@types/node@*":
   version "17.0.24"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.24.tgz#20ba1bf69c1b4ab405c7a01e950c4f446b05029f"
   integrity sha512-aveCYRQbgTH9Pssp1voEP7HiuWlD2jW2BO56w+bVrJn04i61yh6mRfoKO6hEYQD9vF+W8Chkwc6j1M36uPkx4g==
 
-"@types/node@^10.12.0":
-  version "10.17.60"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
-  integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
-
-"@types/node@^16.11.26", "@types/node@^16.11.58":
-  version "16.11.58"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.58.tgz#0a3698dee3492617a8d5fe7998d18d7520b63026"
-  integrity sha512-uMVxJ111wpHzkx/vshZFb6Qni3BOMnlWLq7q9jrwej7Yw/KvjsEbpxCCxw+hLKxexFMc8YmpG8J9tnEe/rKsIg==
-
-"@types/npm@^2.0.32":
-  version "2.0.32"
-  resolved "https://registry.yarnpkg.com/@types/npm/-/npm-2.0.32.tgz#036682075b9c2116b510fe24b52a5b932e3a99d5"
-  integrity sha512-9Lg4woNVzJCtac0lET91H65lbO+8YXfk0nmlmoPGhHXMdaVEDloH6zOPIYMy2n39z/aCXXQR0nax66EDekAyIQ==
-  dependencies:
-    "@types/node" "*"
+"@types/node@^16.11.26", "@types/node@^16.18.2":
+  version "16.18.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.3.tgz#d7f7ba828ad9e540270f01ce00d391c54e6e0abc"
+  integrity sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -2402,18 +2338,10 @@
     "@types/react" "*"
     "@types/react-router" "*"
 
-"@types/react-router@*":
-  version "5.1.7"
-  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.7.tgz#e9d12ed7dcfc79187e4d36667745b69a5aa11556"
-  integrity sha512-2ouP76VQafKjtuc0ShpwUebhHwJo0G6rhahW9Pb8au3tQTjYXd2jta4wv6U2tGLR/I42yuG00+UXjNYY0dTzbg==
-  dependencies:
-    "@types/history" "*"
-    "@types/react" "*"
-
-"@types/react-router@^5.1.18":
-  version "5.1.18"
-  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.18.tgz#c8851884b60bc23733500d86c1266e1cfbbd9ef3"
-  integrity sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==
+"@types/react-router@*", "@types/react-router@^5.1.19":
+  version "5.1.19"
+  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.19.tgz#9b404246fba7f91474d7008a3d48c17b6e075ad6"
+  integrity sha512-Fv/5kb2STAEMT3wHzdKQK2z8xKq38EDIGVrutYLmQVVLe+4orDFquU52hQrULnEHinMKv9FSA6lf9+uNT1ITtA==
   dependencies:
     "@types/history" "^4.7.11"
     "@types/react" "*"
@@ -2484,7 +2412,7 @@
   dependencies:
     "@types/request" "*"
 
-"@types/request@*", "@types/request@^2.47.1", "@types/request@^2.48.7":
+"@types/request@*", "@types/request@^2.48.7":
   version "2.48.8"
   resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.8.tgz#0b90fde3b655ab50976cb8c5ac00faca22f5a82c"
   integrity sha512-whjk1EDJPcAR2kYHRbFl/lKeeKYTi05A15K9bnLInCVroNDCtXce57xKdI0/rQaA3K+6q0eFyUBPmqfSndUZdQ==
@@ -2516,10 +2444,10 @@
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
   integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
 
-"@types/semver@^7.3.12", "@types/semver@^7.3.6":
-  version "7.3.12"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.12.tgz#920447fdd78d76b19de0438b7f60df3c4a80bf1c"
-  integrity sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==
+"@types/semver@^7.3.12", "@types/semver@^7.3.13", "@types/semver@^7.3.6":
+  version "7.3.13"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
+  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
 
 "@types/serve-index@^1.9.1":
   version "1.9.1"
@@ -2536,10 +2464,10 @@
     "@types/mime" "^1"
     "@types/node" "*"
 
-"@types/sharp@^0.30.5":
-  version "0.30.5"
-  resolved "https://registry.yarnpkg.com/@types/sharp/-/sharp-0.30.5.tgz#d75d91f7acf5260525aeae229845046dcff6d17a"
-  integrity sha512-EhO29617AIBqxoVtpd1qdBanWpspk/kD2B6qTFRJ31Q23Rdf+DNU1xlHSwtqvwq1vgOqBwq1i38SX+HGCymIQg==
+"@types/sharp@^0.31.0":
+  version "0.31.0"
+  resolved "https://registry.yarnpkg.com/@types/sharp/-/sharp-0.31.0.tgz#c4af03a7e1d126f0d428a265e126fabd86ab6d0f"
+  integrity sha512-nwivOU101fYInCwdDcH/0/Ru6yIRXOpORx25ynEOc6/IakuCmjOAGpaO5VfUl4QkDtUC6hj+Z2eCQvgXOioknw==
   dependencies:
     "@types/node" "*"
 
@@ -2555,25 +2483,11 @@
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
-"@types/spdy@^3.4.5":
-  version "3.4.5"
-  resolved "https://registry.yarnpkg.com/@types/spdy/-/spdy-3.4.5.tgz#194dc132312ddcd31e8053789ae83a7bb32a8aaf"
-  integrity sha512-/33fIRK/aqkKNxg9BSjpzt1ucmvPremgeDywm9z2C2mOlIh5Ljjvgc3UhQHqwXsSLDLHPT9jlsnrjKQ1XiVJzA==
-  dependencies:
-    "@types/node" "*"
-
 "@types/stack-utils@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
-"@types/stream-buffers@^3.0.3":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/stream-buffers/-/stream-buffers-3.0.4.tgz#bf128182da7bc62722ca0ddf5458a9c65f76e648"
-  integrity sha512-qU/K1tb2yUdhXkLIATzsIPwbtX6BpZk0l3dPW6xqWyhfzzM1ECaQ/8faEnu3CNraLiQ9LHyQQPBGp7N9Fbs25w==
-  dependencies:
-    "@types/node" "*"
-
 "@types/tapable@^1":
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310"
@@ -2586,13 +2500,13 @@
   dependencies:
     "@types/node" "*"
 
-"@types/tar@^4.0.3", "@types/tar@^4.0.5":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@types/tar/-/tar-4.0.5.tgz#5f953f183e36a15c6ce3f336568f6051b7b183f3"
-  integrity sha512-cgwPhNEabHaZcYIy5xeMtux2EmYBitfqEceBUi2t5+ETy4dW6kswt6WX4+HqLeiiKOo42EXbGiDmVJ2x+vi37Q==
+"@types/tar@^6.1.3":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.3.tgz#46a2ce7617950c4852dfd7e9cd41aa8161b9d750"
+  integrity sha512-YzDOr5kdAeqS8dcO6NTTHTMJ44MUCBDoLEIyPtwEn7PssKqUYL49R1iCVJPeiPzPlKi6DbH33eZkpeJ27e4vHg==
   dependencies:
-    "@types/minipass" "*"
     "@types/node" "*"
+    minipass "^3.3.5"
 
 "@types/tcp-port-used@^1.0.1":
   version "1.0.1"
@@ -2635,11 +2549,6 @@
   dependencies:
     source-map "^0.6.1"
 
-"@types/underscore@^1.8.9":
-  version "1.11.4"
-  resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.4.tgz#62e393f8bc4bd8a06154d110c7d042a93751def3"
-  integrity sha512-uO4CD2ELOjw8tasUrAhvnn2W4A0ZECOvMjCivJr4gA9pGgjv+qxKWY9GLTMVEK8ej85BxQOocUyE7hImmSQYcg==
-
 "@types/url-parse@^1.4.8":
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/@types/url-parse/-/url-parse-1.4.8.tgz#c3825047efbca1295b7f1646f38203d9145130d6"
@@ -2705,13 +2614,6 @@
     tapable "^2.2.0"
     webpack "^5"
 
-"@types/ws@^6.0.1":
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-6.0.4.tgz#7797707c8acce8f76d8c34b370d4645b70421ff1"
-  integrity sha512-PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==
-  dependencies:
-    "@types/node" "*"
-
 "@types/ws@^8.5.1":
   version "8.5.3"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d"
@@ -2745,85 +2647,87 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.2.tgz#6df092a20e0f9ec748b27f293a12cb39d0c1fe4d"
-  integrity sha512-OwwR8LRwSnI98tdc2z7mJYgY60gf7I9ZfGjN5EjCwwns9bdTuQfAXcsjSB2wSQ/TVNYSGKf4kzVXbNGaZvwiXw==
+"@typescript-eslint/eslint-plugin@^5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.44.0.tgz#105788f299050c917eb85c4d9fd04b089e3740de"
+  integrity sha512-j5ULd7FmmekcyWeArx+i8x7sdRHzAtXTkmDPthE4amxZOWKFK7bomoJ4r7PJ8K7PoMzD16U8MmuZFAonr1ERvw==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.36.2"
-    "@typescript-eslint/type-utils" "5.36.2"
-    "@typescript-eslint/utils" "5.36.2"
+    "@typescript-eslint/scope-manager" "5.44.0"
+    "@typescript-eslint/type-utils" "5.44.0"
+    "@typescript-eslint/utils" "5.44.0"
     debug "^4.3.4"
-    functional-red-black-tree "^1.0.1"
     ignore "^5.2.0"
+    natural-compare-lite "^1.4.0"
     regexpp "^3.2.0"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.36.2.tgz#3ddf323d3ac85a25295a55fcb9c7a49ab4680ddd"
-  integrity sha512-qS/Kb0yzy8sR0idFspI9Z6+t7mqk/oRjnAYfewG+VN73opAUvmYL3oPIMmgOX6CnQS6gmVIXGshlb5RY/R22pA==
+"@typescript-eslint/parser@^5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.44.0.tgz#99e2c710a2252191e7a79113264f438338b846ad"
+  integrity sha512-H7LCqbZnKqkkgQHaKLGC6KUjt3pjJDx8ETDqmwncyb6PuoigYajyAwBGz08VU/l86dZWZgI4zm5k2VaKqayYyA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.36.2"
-    "@typescript-eslint/types" "5.36.2"
-    "@typescript-eslint/typescript-estree" "5.36.2"
+    "@typescript-eslint/scope-manager" "5.44.0"
+    "@typescript-eslint/types" "5.44.0"
+    "@typescript-eslint/typescript-estree" "5.44.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.36.2.tgz#a75eb588a3879ae659514780831370642505d1cd"
-  integrity sha512-cNNP51L8SkIFSfce8B1NSUBTJTu2Ts4nWeWbFrdaqjmn9yKrAaJUBHkyTZc0cL06OFHpb+JZq5AUHROS398Orw==
+"@typescript-eslint/scope-manager@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.44.0.tgz#988c3f34b45b3474eb9ff0674c18309dedfc3e04"
+  integrity sha512-2pKml57KusI0LAhgLKae9kwWeITZ7IsZs77YxyNyIVOwQ1kToyXRaJLl+uDEXzMN5hnobKUOo2gKntK9H1YL8g==
   dependencies:
-    "@typescript-eslint/types" "5.36.2"
-    "@typescript-eslint/visitor-keys" "5.36.2"
+    "@typescript-eslint/types" "5.44.0"
+    "@typescript-eslint/visitor-keys" "5.44.0"
 
-"@typescript-eslint/type-utils@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.36.2.tgz#752373f4babf05e993adf2cd543a763632826391"
-  integrity sha512-rPQtS5rfijUWLouhy6UmyNquKDPhQjKsaKH0WnY6hl/07lasj8gPaH2UD8xWkePn6SC+jW2i9c2DZVDnL+Dokw==
+"@typescript-eslint/type-utils@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.44.0.tgz#bc5a6e8a0269850714a870c9268c038150dfb3c7"
+  integrity sha512-A1u0Yo5wZxkXPQ7/noGkRhV4J9opcymcr31XQtOzcc5nO/IHN2E2TPMECKWYpM3e6olWEM63fq/BaL1wEYnt/w==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.36.2"
-    "@typescript-eslint/utils" "5.36.2"
+    "@typescript-eslint/typescript-estree" "5.44.0"
+    "@typescript-eslint/utils" "5.44.0"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.36.2.tgz#a5066e500ebcfcee36694186ccc57b955c05faf9"
-  integrity sha512-9OJSvvwuF1L5eS2EQgFUbECb99F0mwq501w0H0EkYULkhFa19Qq7WFbycdw1PexAc929asupbZcgjVIe6OK/XQ==
+"@typescript-eslint/types@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.44.0.tgz#f3f0b89aaff78f097a2927fe5688c07e786a0241"
+  integrity sha512-Tp+zDnHmGk4qKR1l+Y1rBvpjpm5tGXX339eAlRBDg+kgZkz9Bw+pqi4dyseOZMsGuSH69fYfPJCBKBrbPCxYFQ==
 
-"@typescript-eslint/typescript-estree@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.2.tgz#0c93418b36c53ba0bc34c61fe9405c4d1d8fe560"
-  integrity sha512-8fyH+RfbKc0mTspfuEjlfqA4YywcwQK2Amcf6TDOwaRLg7Vwdu4bZzyvBZp4bjt1RRjQ5MDnOZahxMrt2l5v9w==
+"@typescript-eslint/typescript-estree@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.44.0.tgz#0461b386203e8d383bb1268b1ed1da9bc905b045"
+  integrity sha512-M6Jr+RM7M5zeRj2maSfsZK2660HKAJawv4Ud0xT+yauyvgrsHu276VtXlKDFnEmhG+nVEd0fYZNXGoAgxwDWJw==
   dependencies:
-    "@typescript-eslint/types" "5.36.2"
-    "@typescript-eslint/visitor-keys" "5.36.2"
+    "@typescript-eslint/types" "5.44.0"
+    "@typescript-eslint/visitor-keys" "5.44.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.36.2.tgz#b01a76f0ab244404c7aefc340c5015d5ce6da74c"
-  integrity sha512-uNcopWonEITX96v9pefk9DC1bWMdkweeSsewJ6GeC7L6j2t0SJywisgkr9wUTtXk90fi2Eljj90HSHm3OGdGRg==
+"@typescript-eslint/utils@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.44.0.tgz#d733da4d79d6c30f1a68b531cdda1e0c1f00d52d"
+  integrity sha512-fMzA8LLQ189gaBjS0MZszw5HBdZgVwxVFShCO3QN+ws3GlPkcy9YuS3U4wkT6su0w+Byjq3mS3uamy9HE4Yfjw==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.36.2"
-    "@typescript-eslint/types" "5.36.2"
-    "@typescript-eslint/typescript-estree" "5.36.2"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.44.0"
+    "@typescript-eslint/types" "5.44.0"
+    "@typescript-eslint/typescript-estree" "5.44.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
+    semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@5.36.2":
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.2.tgz#2f8f78da0a3bad3320d2ac24965791ac39dace5a"
-  integrity sha512-BtRvSR6dEdrNt7Net2/XDjbYKU5Ml6GqJgVfXT0CxTCJlnIqK7rAGreuWKMT2t8cFUT2Msv5oxw0GMRD7T5J7A==
+"@typescript-eslint/visitor-keys@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.44.0.tgz#10740dc28902bb903d12ee3a005cc3a70207d433"
+  integrity sha512-a48tLG8/4m62gPFbJ27FxwCOqPKxsb8KC3HkmYoq2As/4YyjQl1jDbRr1s63+g4FS/iIehjmN3L5UjmKva1HzQ==
   dependencies:
-    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/types" "5.44.0"
     eslint-visitor-keys "^3.3.0"
 
 "@webassemblyjs/ast@1.11.1":
@@ -3049,20 +2953,15 @@ acorn@^7.0.0, acorn@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
-  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
-
-acorn@^8.8.0:
+acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0:
   version "8.8.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
   integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
-adr@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/adr/-/adr-1.4.1.tgz#78fd4aaaa3fd7c739f3caf89fa30202a6230e855"
-  integrity sha512-WRgljcIOPkWqEWaDTTd4mKmhpiUbucrUmc+gmXyFg2gF2EiQefJhBK0hhEKSIE+Ga+lDhDdk94qROvmG7gCdAQ==
+adr@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/adr/-/adr-1.4.3.tgz#2c817166da6c2d00183dc98cb55f1b5b32a3c482"
+  integrity sha512-g9KcB0i1Hnf2b24LhD6JVZmDEc8si4XVTmic0Tv+mN1YuM2JRckLTIPQbeklnqloSTjk8uLUkr95p307qvSBHA==
   dependencies:
     colors "^1.3.3"
     commander "^5.1.0"
@@ -3144,13 +3043,6 @@ ajv@^8.0.0, ajv@^8.8.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ansi-align@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59"
-  integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==
-  dependencies:
-    string-width "^4.1.0"
-
 ansi-escapes@^4.2.1:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
@@ -3232,10 +3124,10 @@ app-builder-bin@4.0.0:
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
   integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
 
-app-builder-lib@23.3.3:
-  version "23.3.3"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.3.3.tgz#78b9dbb0bd8a69842461edd77a3226d0547c5939"
-  integrity sha512-m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ==
+app-builder-lib@23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8"
+  integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA==
   dependencies:
     "7zip-bin" "~5.1.1"
     "@develar/schema-utils" "~2.6.5"
@@ -3243,13 +3135,13 @@ app-builder-lib@23.3.3:
     "@malept/flatpak-bundler" "^0.4.0"
     async-exit-hook "^2.0.1"
     bluebird-lst "^1.0.9"
-    builder-util "23.3.3"
-    builder-util-runtime "9.0.3"
+    builder-util "23.6.0"
+    builder-util-runtime "9.1.1"
     chromium-pickle-js "^0.2.0"
     debug "^4.3.4"
     ejs "^3.1.7"
     electron-osx-sign "^0.6.0"
-    electron-publish "23.3.3"
+    electron-publish "23.6.0"
     form-data "^4.0.0"
     fs-extra "^10.1.0"
     hosted-git-info "^4.1.0"
@@ -3332,15 +3224,15 @@ array-flatten@^2.1.2:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.1.4, array-includes@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb"
-  integrity sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==
+array-includes@^3.1.4, array-includes@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
+  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.4"
-    es-abstract "^1.19.5"
-    get-intrinsic "^1.1.1"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
     is-string "^1.0.7"
 
 array-union@^2.1.0:
@@ -3358,16 +3250,27 @@ array.prototype.flat@^1.2.5:
     es-abstract "^1.19.2"
     es-shim-unscopables "^1.0.0"
 
-array.prototype.flatmap@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz#a7e8ed4225f4788a70cd910abcf0791e76a5534f"
-  integrity sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==
+array.prototype.flatmap@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
+  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
     es-shim-unscopables "^1.0.0"
 
+array.prototype.tosorted@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz#ccf44738aa2b5ac56578ffda97c03fd3e23dd532"
+  integrity sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
+    get-intrinsic "^1.1.3"
+
 asap@^2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
@@ -3655,20 +3558,6 @@ boolean@^3.0.1:
   resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
   integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==
 
-boxen@^5.0.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50"
-  integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==
-  dependencies:
-    ansi-align "^3.0.0"
-    camelcase "^6.2.0"
-    chalk "^4.1.0"
-    cli-boxes "^2.2.1"
-    string-width "^4.2.2"
-    type-fest "^0.20.2"
-    widest-line "^3.1.0"
-    wrap-ansi "^7.0.0"
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -3770,25 +3659,25 @@ builder-util-runtime@8.9.2:
     debug "^4.3.2"
     sax "^1.2.4"
 
-builder-util-runtime@9.0.3:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz#6c62c493ba2b73c2af92432db4013b5a327f02b2"
-  integrity sha512-SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA==
+builder-util-runtime@9.1.1:
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60"
+  integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==
   dependencies:
     debug "^4.3.4"
     sax "^1.2.4"
 
-builder-util@23.3.3:
-  version "23.3.3"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.3.3.tgz#449ee57ec1ffc7e59f7a3a8a1a33d25cf5e39e43"
-  integrity sha512-MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA==
+builder-util@23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9"
+  integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ==
   dependencies:
     "7zip-bin" "~5.1.1"
     "@types/debug" "^4.1.6"
     "@types/fs-extra" "^9.0.11"
     app-builder-bin "4.0.0"
     bluebird-lst "^1.0.9"
-    builder-util-runtime "9.0.3"
+    builder-util-runtime "9.1.1"
     chalk "^4.1.1"
     cross-spawn "^7.0.3"
     debug "^4.3.4"
@@ -4052,11 +3941,6 @@ chromium-pickle-js@^0.2.0:
   resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
   integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=
 
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-
 ci-info@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2"
@@ -4098,11 +3982,6 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-cli-boxes@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
-  integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
-
 cli-columns@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646"
@@ -4147,13 +4026,13 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-cliui@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
-  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
   dependencies:
     string-width "^4.2.0"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
     wrap-ansi "^7.0.0"
 
 clone-deep@^4.0.1:
@@ -4267,7 +4146,7 @@ colors@1.0.3:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
   integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
 
-colors@^1.3.3, colors@^1.4.0:
+colors@^1.3.3:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
@@ -4397,10 +4276,10 @@ concat-with-sourcemaps@*:
   dependencies:
     source-map "^0.6.1"
 
-concurrently@^7.4.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.4.0.tgz#bb0e344964bc172673577c420db21e963f2f7368"
-  integrity sha512-M6AfrueDt/GEna/Vg9BqQ+93yuvzkSKmoTixnwEJkH0LlcGrRC2eCmjeG1tLLHIYfpYJABokqSGyMcXjm96AFA==
+concurrently@^7.6.0:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.6.0.tgz#531a6f5f30cf616f355a4afb8f8fcb2bba65a49a"
+  integrity sha512-BKtRgvcJGeZ4XttiDiNcFiRlxoAeZOseqUvyYRUp/Vtd+9p1ULmeoSqGsDA+2ivdeDFpqrJvGvmI+StKfKl5hw==
   dependencies:
     chalk "^4.1.0"
     date-fns "^2.29.1"
@@ -4436,18 +4315,6 @@ config-chain@^1.1.11:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-configstore@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
-  integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
-  dependencies:
-    dot-prop "^5.2.0"
-    graceful-fs "^4.1.2"
-    make-dir "^3.0.0"
-    unique-string "^2.0.0"
-    write-file-atomic "^3.0.0"
-    xdg-basedir "^4.0.0"
-
 connect-history-api-fallback@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
@@ -4499,15 +4366,10 @@ copy-anything@^2.0.1:
   dependencies:
     is-what "^3.14.1"
 
-core-js-pure@^3.20.2:
-  version "3.22.5"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.5.tgz#bdee0ed2f9b78f2862cda4338a07b13a49b6c9a9"
-  integrity sha512-8xo9R00iYD7TcV7OrC98GwxiUEAabVWO3dix+uyWjnYrx9fyASLlIX+f/3p5dW5qByaP2bcZ8X/T47s55et/tA==
-
-core-js-pure@^3.8.1:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.21.0.tgz#819adc8dfb808205ce25b51d50591becd615db7e"
-  integrity sha512-VaJUunCZLnxuDbo1rNOzwbet9E1K9joiXS5+DQMPtgxd24wfsZbJZMMfQLGYMlCUvSxLfsRUUhoOR2x28mFfeg==
+core-js-pure@^3.20.2, core-js-pure@^3.23.3:
+  version "3.25.5"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.25.5.tgz#79716ba54240c6aa9ceba6eee08cf79471ba184d"
+  integrity sha512-oml3M22pHM+igfWHDfdLVq2ShWmjM2V4L+dQEBs0DWVIqEm9WHCwGAlZ6BmyBQGy5sFrJmcx+856D9lVKyGWYg==
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -4553,24 +4415,6 @@ create-require@^1.1.0:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
-cross-fetch@^3.0.4:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
-  integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
-  dependencies:
-    node-fetch "2.6.7"
-
-cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -4604,19 +4448,19 @@ css-box-model@^1.2.0:
   dependencies:
     tiny-invariant "^1.0.6"
 
-css-loader@^6.7.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.1.tgz#e98106f154f6e1baf3fc3bc455cb9981c1d5fd2e"
-  integrity sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==
+css-loader@^6.7.2:
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.2.tgz#26bc22401b5921686a10fbeba75d124228302304"
+  integrity sha512-oqGbbVcBJkm8QwmnNzrFrWTnudnRZC+1eXikLJl0n4ljcfotgRifpg2a1lKy8jTrc4/d9A/ap1GFq1jDKG7J+Q==
   dependencies:
     icss-utils "^5.1.0"
-    postcss "^8.4.7"
+    postcss "^8.4.18"
     postcss-modules-extract-imports "^3.0.0"
     postcss-modules-local-by-default "^4.0.0"
     postcss-modules-scope "^3.0.0"
     postcss-modules-values "^4.0.0"
     postcss-value-parser "^4.2.0"
-    semver "^7.3.5"
+    semver "^7.3.8"
 
 css-parse@~2.0.0:
   version "2.0.0"
@@ -4721,6 +4565,11 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-uri-to-buffer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b"
+  integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==
+
 data-urls@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -4850,11 +4699,6 @@ default-gateway@^6.0.3:
   dependencies:
     execa "^5.0.0"
 
-default-shell@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/default-shell/-/default-shell-1.0.1.tgz#752304bddc6174f49eb29cb988feea0b8813c8bc"
-  integrity sha1-dSMEvdxhdPSespy5iP7qC4gTyLw=
-
 defaults@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
@@ -5008,14 +4852,14 @@ dlv@^1.1.3:
   resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
   integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
 
-dmg-builder@23.3.3:
-  version "23.3.3"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.3.3.tgz#b37547f8403c3e9f7c60265a93d902f5b0c395ea"
-  integrity sha512-ECwAjt+ZWyOvddrkDx1xRD6IVUCZb5SV6vSMHZd+Va3G2sUXHrnglR1cGDKRF4oYRQm8SYVrpLZKbi8npyDcAQ==
+dmg-builder@23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948"
+  integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA==
   dependencies:
-    app-builder-lib "23.3.3"
-    builder-util "23.3.3"
-    builder-util-runtime "9.0.3"
+    app-builder-lib "23.6.0"
+    builder-util "23.6.0"
+    builder-util-runtime "9.1.1"
     fs-extra "^10.0.0"
     iconv-lite "^0.6.2"
     js-yaml "^4.1.0"
@@ -5117,10 +4961,10 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
   dependencies:
     domelementtype "^2.2.0"
 
-dompurify@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.0.tgz#c9c88390f024c2823332615c9e20a453cf3825dd"
-  integrity sha512-Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA==
+dompurify@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.1.tgz#f9cb1a275fde9af6f2d0a2644ef648dd6847b631"
+  integrity sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA==
 
 domutils@^2.5.2, domutils@^2.8.0:
   version "2.8.0"
@@ -5196,23 +5040,23 @@ ejs@^3.1.7:
   dependencies:
     jake "^10.8.5"
 
-electron-builder@^23.3.3:
-  version "23.3.3"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.3.3.tgz#88d4e584a99b9e36ca4e8432b1163a1ef877355f"
-  integrity sha512-mFYYdhoFPKevP6y5uaaF3dusmB2OtQ/HnwwpyOePeU7QDS0SEIAUokQsHUanAiJAZcBqtY7iyLBgX18QybdFFw==
+electron-builder@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz#c79050cbdce90ed96c5feb67c34e9e0a21b5331b"
+  integrity sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw==
   dependencies:
     "@types/yargs" "^17.0.1"
-    app-builder-lib "23.3.3"
-    builder-util "23.3.3"
-    builder-util-runtime "9.0.3"
+    app-builder-lib "23.6.0"
+    builder-util "23.6.0"
+    builder-util-runtime "9.1.1"
     chalk "^4.1.1"
-    dmg-builder "23.3.3"
+    dmg-builder "23.6.0"
     fs-extra "^10.0.0"
     is-ci "^3.0.0"
     lazy-val "^1.0.5"
     read-config-file "6.2.0"
-    update-notifier "^5.1.0"
-    yargs "^17.0.1"
+    simple-update-notifier "^1.0.7"
+    yargs "^17.5.1"
 
 electron-devtools-installer@^3.2.0:
   version "3.2.0"
@@ -5244,14 +5088,14 @@ electron-osx-sign@^0.6.0:
     minimist "^1.2.0"
     plist "^3.0.1"
 
-electron-publish@23.3.3:
-  version "23.3.3"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.3.3.tgz#c4125fbb00620acb854f6e994fd3ab3115662ddd"
-  integrity sha512-1dX17eE5xVXedTxjC+gjsP74oC0+sIHgqysp0ryTlF9+yfQUyXjBk6kcK+zhtBA2SsHMSglDtM+JPxDD/WpPTQ==
+electron-publish@23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9"
+  integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg==
   dependencies:
     "@types/fs-extra" "^9.0.11"
-    builder-util "23.3.3"
-    builder-util-runtime "9.0.3"
+    builder-util "23.6.0"
+    builder-util-runtime "9.1.1"
     chalk "^4.1.1"
     fs-extra "^10.0.0"
     lazy-val "^1.0.5"
@@ -5284,10 +5128,10 @@ electron-window-state@^5.0.3:
     jsonfile "^4.0.0"
     mkdirp "^0.5.1"
 
-electron@^19.0.16:
-  version "19.0.16"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.16.tgz#9773478e2607e458e3a353beccdfaa5aee65a9c6"
-  integrity sha512-iL6Bnh+kmlZHam1s77dZZ31J0vbtkkUoR3Y/GXBfqbTinXupBtYmx0+SnvjGnpVzRYoZoSbJs6Qfrfn13BQoMw==
+electron@^19.1.7:
+  version "19.1.7"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.7.tgz#35036a510d9ca943d271e1d1a12463547ed5cd12"
+  integrity sha512-U5rCktIm/EeRjfg/9QFo29jzvZVV2z8Xw7r2NdGTpljmjd+7kySHvUHthO2hk8HETILJivL4+R5lF9zxcJ2J9w==
   dependencies:
     "@electron/get" "^1.14.1"
     "@types/node" "^16.11.26"
@@ -5401,7 +5245,7 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5:
+es-abstract@^1.19.0, es-abstract@^1.19.2, es-abstract@^1.19.5:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.0.tgz#b2d526489cceca004588296334726329e0a6bfb6"
   integrity sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==
@@ -5430,6 +5274,36 @@ es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19
     string.prototype.trimstart "^1.0.5"
     unbox-primitive "^1.0.2"
 
+es-abstract@^1.20.4:
+  version "1.20.4"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861"
+  integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    function.prototype.name "^1.1.5"
+    get-intrinsic "^1.1.3"
+    get-symbol-description "^1.0.0"
+    has "^1.0.3"
+    has-property-descriptors "^1.0.0"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.7"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.2"
+    object-keys "^1.1.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.4.3"
+    safe-regex-test "^1.0.0"
+    string.prototype.trimend "^1.0.5"
+    string.prototype.trimstart "^1.0.5"
+    unbox-primitive "^1.0.2"
+
 es-module-lexer@^0.9.0:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
@@ -5456,75 +5330,75 @@ es6-error@^4.1.1:
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
   integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
 
-esbuild-android-64@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.7.tgz#a521604d8c4c6befc7affedc897df8ccde189bea"
-  integrity sha512-p7rCvdsldhxQr3YHxptf1Jcd86dlhvc3EQmQJaZzzuAxefO9PvcI0GLOa5nCWem1AJ8iMRu9w0r5TG8pHmbi9w==
+esbuild-android-64@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.15.tgz#fd959b034dd761d14e13dda6214b6948841ff4ff"
+  integrity sha512-F+WjjQxO+JQOva3tJWNdVjouFMLK6R6i5gjDvgUthLYJnIZJsp1HlF523k73hELY20WPyEO8xcz7aaYBVkeg5Q==
 
-esbuild-android-arm64@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.7.tgz#307b81f1088bf1e81dfe5f3d1d63a2d2a2e3e68e"
-  integrity sha512-L775l9ynJT7rVqRM5vo+9w5g2ysbOCfsdLV4CWanTZ1k/9Jb3IYlQ06VCI1edhcosTYJRECQFJa3eAvkx72eyQ==
+esbuild-android-arm64@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.15.tgz#9733b71cf0229b4356f106a455b2cfdf7884aa59"
+  integrity sha512-attlyhD6Y22jNyQ0fIIQ7mnPvDWKw7k6FKnsXlBvQE6s3z6s6cuEHcSgoirquQc7TmZgVCK5fD/2uxmRN+ZpcQ==
 
-esbuild-darwin-64@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.7.tgz#270117b0c4ec6bcbc5cf3a297a7d11954f007e11"
-  integrity sha512-KGPt3r1c9ww009t2xLB6Vk0YyNOXh7hbjZ3EecHoVDxgtbUlYstMPDaReimKe6eOEfyY4hBEEeTvKwPsiH5WZg==
+esbuild-darwin-64@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.15.tgz#fc3482fdf5e798dbc0b8b2fe13287d257a45efc6"
+  integrity sha512-ohZtF8W1SHJ4JWldsPVdk8st0r9ExbAOSrBOh5L+Mq47i696GVwv1ab/KlmbUoikSTNoXEhDzVpxUR/WIO19FQ==
 
-esbuild-darwin-arm64@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.7.tgz#97851eacd11dacb7719713602e3319e16202fc77"
-  integrity sha512-kBIHvtVqbSGajN88lYMnR3aIleH3ABZLLFLxwL2stiuIGAjGlQW741NxVTpUHQXUmPzxi6POqc9npkXa8AcSZQ==
+esbuild-darwin-arm64@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.15.tgz#e922ec387c00fa84d664e14b5722fe13613f4adc"
+  integrity sha512-P8jOZ5zshCNIuGn+9KehKs/cq5uIniC+BeCykvdVhx/rBXSxmtj3CUIKZz4sDCuESMbitK54drf/2QX9QHG5Ag==
 
-esbuild-freebsd-64@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.7.tgz#1de15ffaf5ae916aa925800aa6d02579960dd8c4"
-  integrity sha512-hESZB91qDLV5MEwNxzMxPfbjAhOmtfsr9Wnuci7pY6TtEh4UDuevmGmkUIjX/b+e/k4tcNBMf7SRQ2mdNuK/HQ==
+esbuild-freebsd-64@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.15.tgz#69a42d79137d7d3ea718414c432bc10e8bb97c68"
+  integrity sha512-KkTg+AmDXz1IvA9S1gt8dE24C8Thx0X5oM0KGF322DuP+P3evwTL9YyusHAWNsh4qLsR80nvBr/EIYs29VSwuA==
 
-esbuild-freebsd-arm64@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.7.tgz#0f160dbf5c9a31a1d8dd87acbbcb1a04b7031594"
-  integrity sha512-dLFR0ChH5t+b3J8w0fVKGvtwSLWCv7GYT2Y2jFGulF1L5HftQLzVGN+6pi1SivuiVSmTh28FwUhi9PwQicXI6Q==
+esbuild-freebsd-arm64@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.15.tgz#63b6d0dd492f7394f8d07a0e2b931151eb9d60c4"
+  integrity sha512-FUcML0DRsuyqCMfAC+HoeAqvWxMeq0qXvclZZ/lt2kLU6XBnDA5uKTLUd379WYEyVD4KKFctqWd9tTuk8C/96g==
 
-esbuild-linux-32@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.7.tgz#422eb853370a5e40bdce8b39525380de11ccadec"
-  integrity sha512-v3gT/LsONGUZcjbt2swrMjwxo32NJzk+7sAgtxhGx1+ZmOFaTRXBAi1PPfgpeo/J//Un2jIKm/I+qqeo4caJvg==
+esbuild-linux-32@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.15.tgz#7f295795fd7e61ea57d1135f717424a6771a7472"
+  integrity sha512-q28Qn5pZgHNqug02aTkzw5sW9OklSo96b5nm17Mq0pDXrdTBcQ+M6Q9A1B+dalFeynunwh/pvfrNucjzwDXj+Q==
 
-esbuild-linux-64@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.7.tgz#f89c468453bb3194b14f19dc32e0b99612e81d2b"
-  integrity sha512-LxXEfLAKwOVmm1yecpMmWERBshl+Kv5YJ/1KnyAr6HRHFW8cxOEsEfisD3sVl/RvHyW//lhYUVSuy9jGEfIRAQ==
+esbuild-linux-64@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.15.tgz#11a430a86403b0411ca0a355b891f1cb8c4c4ec6"
+  integrity sha512-217KPmWMirkf8liO+fj2qrPwbIbhNTGNVtvqI1TnOWJgcMjUWvd677Gq3fTzXEjilkx2yWypVnTswM2KbXgoAg==
 
-esbuild-linux-arm64@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.7.tgz#68a79d6eb5e032efb9168a0f340ccfd33d6350a1"
-  integrity sha512-P3cfhudpzWDkglutWgXcT2S7Ft7o2e3YDMrP1n0z2dlbUZghUkKCyaWw0zhp4KxEEzt/E7lmrtRu/pGWnwb9vw==
+esbuild-linux-arm64@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.15.tgz#b65f9a2c60e8e5b62f6cfd392cd0410f22e8c390"
+  integrity sha512-/ltmNFs0FivZkYsTzAsXIfLQX38lFnwJTWCJts0IbCqWZQe+jjj0vYBNbI0kmXLb3y5NljiM5USVAO1NVkdh2g==
 
-esbuild-linux-arm@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.7.tgz#2b7c784d0b3339878013dfa82bf5eaf82c7ce7d3"
-  integrity sha512-JKgAHtMR5f75wJTeuNQbyznZZa+pjiUHV7sRZp42UNdyXC6TiUYMW/8z8yIBAr2Fpad8hM1royZKQisqPABPvQ==
+esbuild-linux-arm@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.15.tgz#c8e13e45a0a6f0cb145ce13ae26ce1d2551d9bcc"
+  integrity sha512-RYVW9o2yN8yM7SB1yaWr378CwrjvGCyGybX3SdzPHpikUHkME2AP55Ma20uNwkNyY2eSYFX9D55kDrfQmQBR4w==
 
-esbuild-linux-mips64le@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.7.tgz#bb8330a50b14aa84673816cb63cc6c8b9beb62cc"
-  integrity sha512-T7XKuxl0VpeFLCJXub6U+iybiqh0kM/bWOTb4qcPyDDwNVhLUiPcGdG2/0S7F93czUZOKP57YiLV8YQewgLHKw==
+esbuild-linux-mips64le@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.15.tgz#d4c24d47e43966fcac748c90621be7edd53456c0"
+  integrity sha512-PksEPb321/28GFFxtvL33yVPfnMZihxkEv5zME2zapXGp7fA1X2jYeiTUK+9tJ/EGgcNWuwvtawPxJG7Mmn86A==
 
-esbuild-linux-ppc64le@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.7.tgz#52544e7fa992811eb996674090d0bc41f067a14b"
-  integrity sha512-6mGuC19WpFN7NYbecMIJjeQgvDb5aMuvyk0PDYBJrqAEMkTwg3Z98kEKuCm6THHRnrgsdr7bp4SruSAxEM4eJw==
+esbuild-linux-ppc64le@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.15.tgz#2eba53fe2282438ceca5471bdb57ba2e00216ed6"
+  integrity sha512-ek8gJBEIhcpGI327eAZigBOHl58QqrJrYYIZBWQCnH3UnXoeWMrMZLeeZL8BI2XMBhP+sQ6ERctD5X+ajL/AIA==
 
-esbuild-linux-riscv64@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.7.tgz#a43ae60697992b957e454cbb622f7ee5297e8159"
-  integrity sha512-uUJsezbswAYo/X7OU/P+PuL/EI9WzxsEQXDekfwpQ23uGiooxqoLFAPmXPcRAt941vjlY9jtITEEikWMBr+F/g==
+esbuild-linux-riscv64@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.15.tgz#1afa8dfe55a6c312f1904ee608b81417205f5027"
+  integrity sha512-H5ilTZb33/GnUBrZMNJtBk7/OXzDHDXjIzoLXHSutwwsLxSNaLxzAaMoDGDd/keZoS+GDBqNVxdCkpuiRW4OSw==
 
-esbuild-linux-s390x@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.7.tgz#8c76a125dd10a84c166294d77416caaf5e1c7b64"
-  integrity sha512-+tO+xOyTNMc34rXlSxK7aCwJgvQyffqEM5MMdNDEeMU3ss0S6wKvbBOQfgd5jRPblfwJ6b+bKiz0g5nABpY0QQ==
+esbuild-linux-s390x@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.15.tgz#1f7b3c4429c8ca99920ba6bf356ccc5b38fabd34"
+  integrity sha512-jKaLUg78mua3rrtrkpv4Or2dNTJU7bgHN4bEjT4OX4GR7nLBSA9dfJezQouTxMmIW7opwEC5/iR9mpC18utnxQ==
 
 esbuild-loader@^2.20.0:
   version "2.20.0"
@@ -5538,73 +5412,69 @@ esbuild-loader@^2.20.0:
     tapable "^2.2.0"
     webpack-sources "^2.2.0"
 
-esbuild-netbsd-64@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.7.tgz#19b2e75449d7d9c32b5d8a222bac2f1e0c3b08fd"
-  integrity sha512-yVc4Wz+Pu3cP5hzm5kIygNPrjar/v5WCSoRmIjCPWfBVJkZNb5brEGKUlf+0Y759D48BCWa0WHrWXaNy0DULTQ==
+esbuild-netbsd-64@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.15.tgz#d72c7155686c938c1aff126209b689c22823347c"
+  integrity sha512-aOvmF/UkjFuW6F36HbIlImJTTx45KUCHJndtKo+KdP8Dhq3mgLRKW9+6Ircpm8bX/RcS3zZMMmaBLkvGY06Gvw==
 
-esbuild-openbsd-64@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.7.tgz#1357b2bf72fd037d9150e751420a1fe4c8618ad7"
-  integrity sha512-GsimbwC4FSR4lN3wf8XmTQ+r8/0YSQo21rWDL0XFFhLHKlzEA4SsT1Tl8bPYu00IU6UWSJ+b3fG/8SB69rcuEQ==
+esbuild-openbsd-64@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.15.tgz#761bd87ecab97386948eaf667a065cb0ecaa0f76"
+  integrity sha512-HFFX+WYedx1w2yJ1VyR1Dfo8zyYGQZf1cA69bLdrHzu9svj6KH6ZLK0k3A1/LFPhcEY9idSOhsB2UyU0tHPxgQ==
 
-esbuild-sunos-64@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.7.tgz#87ab2c604592a9c3c763e72969da0d72bcde91d2"
-  integrity sha512-8CDI1aL/ts0mDGbWzjEOGKXnU7p3rDzggHSBtVryQzkSOsjCHRVe0iFYUuhczlxU1R3LN/E7HgUO4NXzGGP/Ag==
+esbuild-sunos-64@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.15.tgz#07e04cbf9747f281a967d09230a158a1be5b530c"
+  integrity sha512-jOPBudffG4HN8yJXcK9rib/ZTFoTA5pvIKbRrt3IKAGMq1EpBi4xoVoSRrq/0d4OgZLaQbmkHp8RO9eZIn5atA==
 
-esbuild-windows-32@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.7.tgz#c81e688c0457665a8d463a669e5bf60870323e99"
-  integrity sha512-cOnKXUEPS8EGCzRSFa1x6NQjGhGsFlVgjhqGEbLTPsA7x4RRYiy2RKoArNUU4iR2vHmzqS5Gr84MEumO/wxYKA==
+esbuild-windows-32@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.15.tgz#130d1982cc41fb67461e9f8a65c6ebd13a1f35bb"
+  integrity sha512-MDkJ3QkjnCetKF0fKxCyYNBnOq6dmidcwstBVeMtXSgGYTy8XSwBeIE4+HuKiSsG6I/mXEb++px3IGSmTN0XiA==
 
-esbuild-windows-64@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.7.tgz#2421d1ae34b0561a9d6767346b381961266c4eff"
-  integrity sha512-7MI08Ec2sTIDv+zH6StNBKO+2hGUYIT42GmFyW6MBBWWtJhTcQLinKS6ldIN1d52MXIbiJ6nXyCJ+LpL4jBm3Q==
+esbuild-windows-64@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.15.tgz#638bdf495c109c1882e8b0529cb8e2fea11383fb"
+  integrity sha512-xaAUIB2qllE888SsMU3j9nrqyLbkqqkpQyWVkfwSil6BBPgcPk3zOFitTTncEKCLTQy3XV9RuH7PDj3aJDljWA==
 
-esbuild-windows-arm64@0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.7.tgz#7d5e9e060a7b454cb2f57f84a3f3c23c8f30b7d2"
-  integrity sha512-R06nmqBlWjKHddhRJYlqDd3Fabx9LFdKcjoOy08YLimwmsswlFBJV4rXzZCxz/b7ZJXvrZgj8DDv1ewE9+StMw==
+esbuild-windows-arm64@0.15.15:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.15.tgz#5a277ce10de999d2a6465fc92a8c2a2d207ebd31"
+  integrity sha512-ttuoCYCIJAFx4UUKKWYnFdrVpoXa3+3WWkXVI6s09U+YjhnyM5h96ewTq/WgQj9LFSIlABQvadHSOQyAVjW5xQ==
 
-esbuild@^0.15.6, esbuild@^0.15.7:
-  version "0.15.7"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.7.tgz#8a1f1aff58671a3199dd24df95314122fc1ddee8"
-  integrity sha512-7V8tzllIbAQV1M4QoE52ImKu8hT/NLGlGXkiDsbEU5PS6K8Mn09ZnYoS+dcmHxOS9CRsV4IRAMdT3I67IyUNXw==
+esbuild@^0.15.15, esbuild@^0.15.6:
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.15.tgz#503b70bdc18d72d8fc2962ed3ab9219249e58bbe"
+  integrity sha512-TEw/lwK4Zzld9x3FedV6jy8onOUHqcEX3ADFk4k+gzPUwrxn8nWV62tH0udo8jOtjFodlEfc4ypsqX3e+WWO6w==
   optionalDependencies:
-    "@esbuild/linux-loong64" "0.15.7"
-    esbuild-android-64 "0.15.7"
-    esbuild-android-arm64 "0.15.7"
-    esbuild-darwin-64 "0.15.7"
-    esbuild-darwin-arm64 "0.15.7"
-    esbuild-freebsd-64 "0.15.7"
-    esbuild-freebsd-arm64 "0.15.7"
-    esbuild-linux-32 "0.15.7"
-    esbuild-linux-64 "0.15.7"
-    esbuild-linux-arm "0.15.7"
-    esbuild-linux-arm64 "0.15.7"
-    esbuild-linux-mips64le "0.15.7"
-    esbuild-linux-ppc64le "0.15.7"
-    esbuild-linux-riscv64 "0.15.7"
-    esbuild-linux-s390x "0.15.7"
-    esbuild-netbsd-64 "0.15.7"
-    esbuild-openbsd-64 "0.15.7"
-    esbuild-sunos-64 "0.15.7"
-    esbuild-windows-32 "0.15.7"
-    esbuild-windows-64 "0.15.7"
-    esbuild-windows-arm64 "0.15.7"
+    "@esbuild/android-arm" "0.15.15"
+    "@esbuild/linux-loong64" "0.15.15"
+    esbuild-android-64 "0.15.15"
+    esbuild-android-arm64 "0.15.15"
+    esbuild-darwin-64 "0.15.15"
+    esbuild-darwin-arm64 "0.15.15"
+    esbuild-freebsd-64 "0.15.15"
+    esbuild-freebsd-arm64 "0.15.15"
+    esbuild-linux-32 "0.15.15"
+    esbuild-linux-64 "0.15.15"
+    esbuild-linux-arm "0.15.15"
+    esbuild-linux-arm64 "0.15.15"
+    esbuild-linux-mips64le "0.15.15"
+    esbuild-linux-ppc64le "0.15.15"
+    esbuild-linux-riscv64 "0.15.15"
+    esbuild-linux-s390x "0.15.15"
+    esbuild-netbsd-64 "0.15.15"
+    esbuild-openbsd-64 "0.15.15"
+    esbuild-sunos-64 "0.15.15"
+    esbuild-windows-32 "0.15.15"
+    esbuild-windows-64 "0.15.15"
+    esbuild-windows-arm64 "0.15.15"
 
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
-escape-goat@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675"
-  integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==
-
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -5657,6 +5527,19 @@ eslint-import-resolver-node@^0.3.6:
     debug "^3.2.7"
     resolve "^1.20.0"
 
+eslint-import-resolver-typescript@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.2.tgz#9431acded7d898fd94591a08ea9eec3514c7de91"
+  integrity sha512-zX4ebnnyXiykjhcBvKIf5TNvt8K7yX6bllTRZ14MiurKPjDpCAZujlszTdB8pcNXhZcOf+god4s9SjQa5GnytQ==
+  dependencies:
+    debug "^4.3.4"
+    enhanced-resolve "^5.10.0"
+    get-tsconfig "^4.2.0"
+    globby "^13.1.2"
+    is-core-module "^2.10.0"
+    is-glob "^4.0.3"
+    synckit "^0.8.4"
+
 eslint-module-utils@^2.7.3:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
@@ -5694,25 +5577,26 @@ eslint-plugin-react-hooks@^4.6.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
   integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
 
-eslint-plugin-react@7.31.7:
-  version "7.31.7"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.7.tgz#36fb1c611a7db5f757fce09cbbcc01682f8b0fbb"
-  integrity sha512-8NldBTeYp/kQoTV1uT0XF6HcmDqbgZ0lNPkN0wlRw8DJKXEnaWu+oh/6gt3xIhzvQ35wB2Y545fJhIbJSZ2NNw==
+eslint-plugin-react@7.31.11:
+  version "7.31.11"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz#011521d2b16dcf95795df688a4770b4eaab364c8"
+  integrity sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw==
   dependencies:
-    array-includes "^3.1.5"
-    array.prototype.flatmap "^1.3.0"
+    array-includes "^3.1.6"
+    array.prototype.flatmap "^1.3.1"
+    array.prototype.tosorted "^1.1.1"
     doctrine "^2.1.0"
     estraverse "^5.3.0"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
     minimatch "^3.1.2"
-    object.entries "^1.1.5"
-    object.fromentries "^2.0.5"
-    object.hasown "^1.1.1"
-    object.values "^1.1.5"
+    object.entries "^1.1.6"
+    object.fromentries "^2.0.6"
+    object.hasown "^1.1.2"
+    object.values "^1.1.6"
     prop-types "^15.8.1"
     resolve "^2.0.0-next.3"
     semver "^6.3.0"
-    string.prototype.matchall "^4.0.7"
+    string.prototype.matchall "^4.0.8"
 
 eslint-plugin-unused-imports@^2.0.0:
   version "2.0.0"
@@ -5759,15 +5643,15 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@^8.23.0:
-  version "8.23.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.0.tgz#a184918d288820179c6041bb3ddcc99ce6eea040"
-  integrity sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==
+eslint@^8.28.0:
+  version "8.28.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.28.0.tgz#81a680732634677cc890134bcdd9fdfea8e63d6e"
+  integrity sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==
   dependencies:
-    "@eslint/eslintrc" "^1.3.1"
-    "@humanwhocodes/config-array" "^0.10.4"
-    "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
+    "@eslint/eslintrc" "^1.3.3"
+    "@humanwhocodes/config-array" "^0.11.6"
     "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -5783,15 +5667,15 @@ eslint@^8.23.0:
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
     find-up "^5.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^6.0.1"
+    glob-parent "^6.0.2"
     globals "^13.15.0"
-    globby "^11.1.0"
     grapheme-splitter "^1.0.4"
     ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
+    js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
@@ -5887,19 +5771,6 @@ execa@5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -6026,10 +5897,10 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.11, fast-glob@^3.2.5, fast-glob@^3.2.9:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
-  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
+fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.5, fast-glob@^3.2.9:
+  version "3.2.12"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
+  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -6090,6 +5961,14 @@ fecha@^4.2.0:
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd"
   integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==
 
+fetch-blob@^3.1.2, fetch-blob@^3.1.4:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.2.0.tgz#f09b8d4bbd45adc6f0c20b7e787e793e309dcce9"
+  integrity sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==
+  dependencies:
+    node-domexception "^1.0.0"
+    web-streams-polyfill "^3.0.3"
+
 figures@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
@@ -6238,11 +6117,6 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
   integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
 
-flex.box@^3.4.4:
-  version "3.4.4"
-  resolved "https://registry.yarnpkg.com/flex.box/-/flex.box-3.4.4.tgz#cef28a542458f4668c5d499bcd7fa97aa82b8413"
-  integrity sha512-PG0rguh20zXyBuWmMmDCR0JjW9rtxK48OGMSzpLyGSRioTKeMNs9nbn1Dun+EsIp3wZozSpChbqMsU8a3IgHXg==
-
 fn.name@1.x.x:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
@@ -6323,6 +6197,13 @@ form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
+formdata-polyfill@^4.0.10:
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423"
+  integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==
+  dependencies:
+    fetch-blob "^3.1.2"
+
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -6403,11 +6284,6 @@ function.prototype.name@^1.1.5:
     es-abstract "^1.19.0"
     functions-have-names "^1.2.2"
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
 functions-have-names@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
@@ -6453,12 +6329,21 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
+get-intrinsic@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
+  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.3"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
-get-stream@^4.0.0, get-stream@^4.1.0:
+get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
@@ -6485,6 +6370,11 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
+get-tsconfig@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.2.0.tgz#ff368dd7104dab47bf923404eb93838245c66543"
+  integrity sha512-X8u8fREiYOE6S8hLbq99PeykTDoLVnxvF4DjWKJmz9xy2nNRdUcV8ZN9tniJFeKyTU3qnC9lL8n4Chd6LmVKHg==
+
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -6504,7 +6394,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1, glob-parent@^6.0.2:
+glob-parent@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@ -6551,13 +6441,6 @@ global-agent@^3.0.0:
     semver "^7.3.2"
     serialize-error "^7.0.1"
 
-global-dirs@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686"
-  integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==
-  dependencies:
-    ini "2.0.0"
-
 global-tunnel-ng@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
@@ -6587,6 +6470,11 @@ globalthis@^1.0.1:
   dependencies:
     define-properties "^1.1.3"
 
+globalyzer@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"
+  integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==
+
 globby@^11.0.1, globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
@@ -6599,6 +6487,22 @@ globby@^11.0.1, globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
+globby@^13.1.2:
+  version "13.1.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.2.tgz#29047105582427ab6eca4f905200667b056da515"
+  integrity sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==
+  dependencies:
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.11"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^4.0.0"
+
+globrex@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
+  integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
+
 got@^11.8.5:
   version "11.8.5"
   resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
@@ -6761,11 +6665,6 @@ has-unicode@^2.0.1:
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
-has-yarn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
-  integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
-
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -6778,13 +6677,6 @@ he@^1.2.0:
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-history@*:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"
-  integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==
-  dependencies:
-    "@babel/runtime" "^7.7.6"
-
 history@^4.10.1, history@^4.9.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
@@ -6811,10 +6703,10 @@ hosted-git-info@^4.1.0:
   dependencies:
     lru-cache "^6.0.0"
 
-hosted-git-info@^5.0.0, hosted-git-info@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.1.0.tgz#9786123f92ef3627f24abc3f15c20d98ec4a6594"
-  integrity sha512-Ek+QmMEqZF8XrbFdwoDjSbm7rT23pCgEMOJmz6GPk/s4yH//RQfNPArhIxbguNxROq/+5lNBwCDHMhA903Kx1Q==
+hosted-git-info@^5.0.0, hosted-git-info@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.2.1.tgz#0ba1c97178ef91f3ab30842ae63d6a272341156f"
+  integrity sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==
   dependencies:
     lru-cache "^7.5.1"
 
@@ -7080,10 +6972,10 @@ immediate@~3.0.5:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
   integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
-immer@^9.0.15:
-  version "9.0.15"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.15.tgz#0b9169e5b1d22137aba7d43f8a81a495dd1b62dc"
-  integrity sha512-2eB/sswms9AEUSkOm4SbV5Y7Vmt/bKRwByd52jfLkW4OLYeaTP3EEiJ9agqU0O/tq6Dk62Zfj+TJSqfm1rLVGQ==
+immer@^9.0.16:
+  version "9.0.16"
+  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.16.tgz#8e7caab80118c2b54b37ad43e05758cdefad0198"
+  integrity sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==
 
 immutable@^4.0.0:
   version "4.0.0"
@@ -7098,11 +6990,6 @@ import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-lazy@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
-  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
-
 import-local@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
@@ -7149,11 +7036,6 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
-  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
-
 ini@^1.3.4, ini@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
@@ -7277,12 +7159,10 @@ is-callable@^1.1.4, is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-ci@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
-  dependencies:
-    ci-info "^2.0.0"
+is-callable@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
 is-ci@^3.0.0:
   version "3.0.1"
@@ -7298,6 +7178,13 @@ is-cidr@^4.0.2:
   dependencies:
     cidr-regex "^3.1.1"
 
+is-core-module@^2.10.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
+  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+  dependencies:
+    has "^1.0.3"
+
 is-core-module@^2.2.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
@@ -7376,14 +7263,6 @@ is-in-browser@^1.0.2, is-in-browser@^1.1.3:
   resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
   integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=
 
-is-installed-globally@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
-  integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==
-  dependencies:
-    global-dirs "^3.0.0"
-    is-path-inside "^3.0.2"
-
 is-lambda@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
@@ -7394,11 +7273,6 @@ is-negative-zero@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
 
-is-npm@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8"
-  integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==
-
 is-number-object@^1.0.4:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
@@ -7433,7 +7307,7 @@ is-path-cwd@^2.2.0:
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
   integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
 
-is-path-inside@^3.0.2:
+is-path-inside@^3.0.2, is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
@@ -7470,11 +7344,6 @@ is-shared-array-buffer@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
 is-stream@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
@@ -7499,7 +7368,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
@@ -7528,11 +7397,6 @@ is-wsl@^2.2.0:
   dependencies:
     is-docker "^2.0.0"
 
-is-yarn-global@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
-  integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
-
 is2@^2.0.6:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/is2/-/is2-2.0.7.tgz#d084e10cab3bd45d6c9dfde7a48599fcbb93fcac"
@@ -7784,14 +7648,6 @@ jest-environment-node@^28.1.3:
     jest-mock "^28.1.3"
     jest-util "^28.1.3"
 
-jest-fetch-mock@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz#31749c456ae27b8919d69824f1c2bd85fe0a1f3b"
-  integrity sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==
-  dependencies:
-    cross-fetch "^3.0.4"
-    promise-polyfill "^8.1.3"
-
 jest-get-type@^28.0.2:
   version "28.0.2"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-28.0.2.tgz#34622e628e4fdcd793d46db8a242227901fcf203"
@@ -7849,10 +7705,10 @@ jest-message-util@^28.1.3:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-mock-extended@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/jest-mock-extended/-/jest-mock-extended-2.0.7.tgz#73ad87d8a744949bc3415d840f03468229f73f2a"
-  integrity sha512-h8brJJN5BZb03hTwplvt+raT6Nj0U2U71Z26Py12Qc3kvYnAjDW/zSuQJLnXCNyyufy592VC9k3X7AOz+2H52g==
+jest-mock-extended@^2.0.9:
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/jest-mock-extended/-/jest-mock-extended-2.0.9.tgz#bc0e4a269cdb6047d7cc086e1d9722f7215ca795"
+  integrity sha512-eRZq7/FgwHbxOMm3Lo4DpQX6S2zi4OvwMVFHEb3FgDLp0Xy3P1WARkF93xxO5uD4nAHiEPYHZ25qVU9mAVxoLQ==
   dependencies:
     ts-essentials "^7.0.3"
 
@@ -8047,10 +7903,10 @@ jest@^28.1.3:
     import-local "^3.0.2"
     jest-cli "^28.1.3"
 
-joi@^17.6.0:
-  version "17.6.0"
-  resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.0.tgz#0bb54f2f006c09a96e75ce687957bd04290054b2"
-  integrity sha512-OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw==
+joi@^17.7.0:
+  version "17.7.0"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-17.7.0.tgz#591a33b1fe1aca2bc27f290bcad9b9c1c570a6b3"
+  integrity sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg==
   dependencies:
     "@hapi/hoek" "^9.0.0"
     "@hapi/topo" "^5.0.0"
@@ -8059,15 +7915,20 @@ joi@^17.6.0:
     "@sideway/pinpoint" "^2.0.0"
 
 jose@^4.1.4:
-  version "4.8.3"
-  resolved "https://registry.yarnpkg.com/jose/-/jose-4.8.3.tgz#5a754fb4aa5f2806608d083f438e6916b11087da"
-  integrity sha512-7rySkpW78d8LBp4YU70Wb7+OTgE3OwAALNVZxhoIhp4Kscp+p/fBkdpxGAMKxvCAMV4QfXBU9m6l9nX/vGwd2g==
+  version "4.9.3"
+  resolved "https://registry.yarnpkg.com/jose/-/jose-4.9.3.tgz#890abd3f26725fe0f2aa720bc2f7835702b624db"
+  integrity sha512-f8E/z+T3Q0kA9txzH2DKvH/ds2uggcw0m3vVPSB9HrSkrQ7mojjifvS7aR8cw+lQl2Fcmx9npwaHpM/M3GD8UQ==
 
 joycon@^3.0.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03"
   integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==
 
+js-sdsl@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.4.tgz#78793c90f80e8430b7d8dc94515b6c77d98a26a6"
+  integrity sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -8231,10 +8092,10 @@ json5@^2.1.2, json5@^2.2.0, json5@^2.2.1:
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
 
-jsonc-parser@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
-  integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==
+jsonc-parser@^3.0.0, jsonc-parser@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
+  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
 
 jsonfile@^4.0.0:
   version "4.0.0"
@@ -8412,13 +8273,6 @@ kuler@^2.0.0:
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3"
   integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==
 
-latest-version@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
-  integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
-  dependencies:
-    package-json "^6.3.0"
-
 lazy-cache@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
@@ -8493,12 +8347,12 @@ libnpmdiff@^4.0.5:
     pacote "^13.6.1"
     tar "^6.1.0"
 
-libnpmexec@^4.0.12:
-  version "4.0.12"
-  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-4.0.12.tgz#462955cdc80894122a09720ccb86e074989ab209"
-  integrity sha512-iGk63HwzPz6U2mDyuUu0AV4f/yWpxxbrly6LUJgZZ3tD00qVgV530oI4sr3baTLzq8VOyQeDJr0wmEdpXJsHjQ==
+libnpmexec@^4.0.14:
+  version "4.0.14"
+  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-4.0.14.tgz#9ad44232434b374e477eb2c2e4548baaf698f773"
+  integrity sha512-dwmzv2K29SdoAHBOa7QR6CfQbFG/PiZDRF6HZrlI6C4DLt2hNgOHTFaUGOpqE2C+YGu0ZwYTDywxRe0eOnf0ZA==
   dependencies:
-    "@npmcli/arborist" "^5.6.1"
+    "@npmcli/arborist" "^5.6.3"
     "@npmcli/ci-detect" "^2.0.0"
     "@npmcli/fs" "^2.1.1"
     "@npmcli/run-script" "^4.2.0"
@@ -8513,12 +8367,12 @@ libnpmexec@^4.0.12:
     semver "^7.3.7"
     walk-up-path "^1.0.0"
 
-libnpmfund@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-3.0.3.tgz#334a3bb58c64ad18803056373545f6528b04dceb"
-  integrity sha512-vIlrudn2vzCQ8YRiImh/Kcf6/igjITDNqJPm2ifQDLJIrtqHc22BQb1SCyH+bajHL/DVHzGKD4VuxUtLHT641w==
+libnpmfund@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-3.0.5.tgz#817f9e2120889beb483d9ba8eda142bb84293e4e"
+  integrity sha512-KdeRoG/dem8H3PcEU2/0SKi3ip7AWwczgS72y/3PE+PBrz/s/G52FNIA9jeLnBirkLC0sOyQHfeM3b7e24ZM+g==
   dependencies:
-    "@npmcli/arborist" "^5.6.1"
+    "@npmcli/arborist" "^5.6.3"
 
 libnpmhook@^8.0.4:
   version "8.0.4"
@@ -8631,10 +8485,10 @@ loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
-  integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
+loader-utils@^2.0.0, loader-utils@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
+  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -8727,7 +8581,7 @@ lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-logform@^2.2.0, logform@^2.3.2, logform@^2.4.0:
+logform@^2.3.2, logform@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/logform/-/logform-2.4.0.tgz#131651715a17d50f09c2a2c1a524ff1a4164bcfe"
   integrity sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==
@@ -8796,13 +8650,6 @@ lz-string@^1.4.4:
   resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26"
   integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=
 
-mac-ca@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/mac-ca/-/mac-ca-1.0.6.tgz#89860edfeebcc4593567044281ab3500961ec15f"
-  integrity sha512-uuCaT+41YtIQlDDvbigP1evK1iUk97zRirP9+8rZJz8x0eIQZG8Z7YQegMTsCiMesLPb6LBgCS95uyAvVA1tmg==
-  dependencies:
-    node-forge "^0.10.0"
-
 make-dir@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -8916,10 +8763,15 @@ markdown@^0.5.0:
   dependencies:
     nopt "~2.1.1"
 
-marked@^4.0.19, marked@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-4.1.0.tgz#3fc6e7485f21c1ca5d6ec4a39de820e146954796"
-  integrity sha512-+Z6KDjSPa6/723PQYyc1axYZpYYpDnECDaU6hkaf5gqBieBkMKYReL5hteF2QizhlMbgbo8umXl/clZ67+GlsA==
+marked@^4.0.19:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.0.tgz#f1683b077626a6c53e28926b798a18184aa13a91"
+  integrity sha512-1qWHjHlBKwjnDfrkxd0L3Yx4LTad/WO7+d13YsXAC/ZfKj7p0xkLV3sDXJzfWgL7GfW4IBZwMAYWaz+ifyQouQ==
+
+marked@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.3.tgz#bd76a5eb510ff1d8421bc6c3b2f0b93488c15bea"
+  integrity sha512-slWRdJkbTZ+PjkyJnE30Uid64eHwbwa1Q25INCAYfZlK4o6ylagBy/Le9eWntqJFoFT93ikUKMv47GZ4gTwHkw==
 
 matcher-collection@^2.0.0:
   version "2.0.1"
@@ -8958,11 +8810,21 @@ memfs@^3.1.2, memfs@^3.4.1:
   dependencies:
     fs-monkey "1.0.3"
 
-"memoize-one@>=3.1.1 <6", memoize-one@^5.0.0, memoize-one@^5.1.1:
+"memoize-one@>=3.1.1 <6", memoize-one@^5.1.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
   integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
 
+memoize-one@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045"
+  integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==
+
+memorystream@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
+  integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==
+
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -8988,7 +8850,7 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4:
+micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -9043,18 +8905,10 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-mini-create-react-context@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e"
-  integrity sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==
-  dependencies:
-    "@babel/runtime" "^7.12.1"
-    tiny-warning "^1.0.3"
-
-mini-css-extract-plugin@*, mini-css-extract-plugin@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz#9a1251d15f2035c342d99a468ab9da7a0451b71e"
-  integrity sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==
+mini-css-extract-plugin@*, mini-css-extract-plugin@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.0.tgz#d7d9ba0c5b596d155e36e2b174082fc7f010dd64"
+  integrity sha512-auqtVo8KhTScMsba7MbijqZTfibbXiBNlPAQbsVt7enQfcDYLdgG57eGxMqwVU3mfeWANY4F1wUg+rMF+ycZgw==
   dependencies:
     schema-utils "^4.0.0"
 
@@ -9147,17 +9001,10 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^3.0.0:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
-  integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
-  dependencies:
-    yallist "^4.0.0"
-
-minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
-  integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
+minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6, minipass@^3.3.5:
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.5.tgz#6da7e53a48db8a856eeb9153d85b230a2119e819"
+  integrity sha512-rQ/p+KfKBkeNwo04U15i+hOwoVBVmekmm/HcfTkTN2t9pbQKCMm4eN5gFeqgrrSp/kH/7BYYhTIHOxGqzbBPaA==
   dependencies:
     yallist "^4.0.0"
 
@@ -9217,10 +9064,10 @@ mobx-react-lite@^3.4.0:
   resolved "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-3.4.0.tgz#d59156a96889cdadad751e5e4dab95f28926dfff"
   integrity sha512-bRuZp3C0itgLKHu/VNxi66DN/XVkQG7xtoBVWxpvC5FhAqbOCP21+nPhULjnzEqd7xBMybp6KwytdUpZKEgpIQ==
 
-mobx-react@^7.5.3:
-  version "7.5.3"
-  resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-7.5.3.tgz#74b1c148d2f2a1affab3153ea570ab52c7eff70c"
-  integrity sha512-+ltotliKt4Bjn3d8taZH/VFAcRUbaASvsM8/QSvmHXcZ++RZwaFtjl9JkIosy1byaJGEDS3EFFx2InRm2VaSUw==
+mobx-react@^7.6.0:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-7.6.0.tgz#ebf0456728a9bd2e5c24fdcf9b36e285a222a7d6"
+  integrity sha512-+HQUNuh7AoQ9ZnU6c4rvbiVVl+wEkb9WqYsVDzGLng+Dqj1XntHu79PvEWKtSMoMj67vFp/ZPXcElosuJO8ckA==
   dependencies:
     mobx-react-lite "^3.4.0"
 
@@ -9229,15 +9076,15 @@ mobx-utils@^6.0.4:
   resolved "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-6.0.5.tgz#0cce9afb07fbba1fb559f959f8cea1f44baa7252"
   integrity sha512-QOduwicYedD4mwYZRl8+c3BalljFDcubg+PUGqBkn8tOuBoj2q7GhjXBP6JXM9J+Zh+2mePK8IoToeLfqr3Z/w==
 
-mobx@^6.3.0, mobx@^6.6.2:
-  version "6.6.2"
-  resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.6.2.tgz#9d9102a0e337e3fc09cb2d8ca0c6f00b61270d5a"
-  integrity sha512-IOpS0bf3+hXIhDIy+CmlNMBfFpAbHS0aVHcNC+xH/TFYEKIIVDKNYRh9eKlXuVfJ1iRKAp0cRVmO145CyJAMVQ==
+mobx@^6.3.0, mobx@^6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.7.0.tgz#2d805610fee1801fd015c54fd5400d2601aa3768"
+  integrity sha512-1kBLBdSNG2bA522HQdbsTvwAwYf9hq9FWxmlhX7wTsJUAI54907J+ozfGW+LoYUo06vjit748g6QH1AAGLNebw==
 
-mock-fs@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-5.1.4.tgz#d64dc37b2793613ca7148b510b1167b5b8afb6b8"
-  integrity sha512-sudhLjCjX37qWIcAlIv1OnAxB2wI4EmXByVuUjILh1rKGNGpGU8GNnzw+EAbrhdpBe0TL/KONbK1y3RXZk8SxQ==
+mock-fs@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-5.2.0.tgz#3502a9499c84c0a1218ee4bf92ae5bf2ea9b2b5e"
+  integrity sha512-2dF2R6YMSZbpip1V1WHKGLNjr/k48uQClqMVb5H3MOvwc9qhYis3/IWbj02qIg/Y8MDXKFF4c5v0rxx2o6xTZw==
 
 mock-http@^1.1.0:
   version "1.1.0"
@@ -9246,10 +9093,10 @@ mock-http@^1.1.0:
   dependencies:
     mergee "^1.0.0"
 
-moment-timezone@^0.5.37:
-  version "0.5.37"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.37.tgz#adf97f719c4e458fdb12e2b4e87b8bec9f4eef1e"
-  integrity sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg==
+moment-timezone@^0.5.39:
+  version "0.5.39"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.39.tgz#342625a3b98810f04c8f4ea917e448d3525e600b"
+  integrity sha512-hoB6suq4ISDj7BDgctiOy6zljBsdYT0++0ZzZm9rtxIvJhIbQ3nmbgSWe7dNFGurl6/7b1OUkHlmN9JWgXVz7w==
   dependencies:
     moment ">= 2.9.0"
 
@@ -9320,6 +9167,11 @@ napi-build-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
   integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
 
+natural-compare-lite@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
+  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -9349,11 +9201,6 @@ neo-async@^2.6.0, neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
 no-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
@@ -9379,17 +9226,19 @@ node-addon-api@^5.0.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.0.0.tgz#7d7e6f9ef89043befdb20c1989c905ebde18c501"
   integrity sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA==
 
-node-fetch@2.6.7, node-fetch@^2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
-  dependencies:
-    whatwg-url "^5.0.0"
+node-domexception@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
+  integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
 
-node-forge@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
-  integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
+node-fetch@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.0.tgz#37e71db4ecc257057af828d523a7243d651d91e4"
+  integrity sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA==
+  dependencies:
+    data-uri-to-buffer "^4.0.0"
+    fetch-blob "^3.1.4"
+    formdata-polyfill "^4.0.10"
 
 node-forge@^1, node-forge@^1.2.1:
   version "1.3.1"
@@ -9452,15 +9301,15 @@ node-releases@^2.0.3:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.4.tgz#f38252370c43854dc48aa431c766c6c398f40476"
   integrity sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==
 
-nodemon@^2.0.19:
-  version "2.0.19"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.19.tgz#cac175f74b9cb8b57e770d47841995eebe4488bd"
-  integrity sha512-4pv1f2bMDj0Eeg/MhGqxrtveeQ5/G/UVe9iO6uTZzjnRluSA4PVWf8CW99LUPwGB3eNIA7zUFoP77YuI7hOc0A==
+nodemon@^2.0.20:
+  version "2.0.20"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.20.tgz#e3537de768a492e8d74da5c5813cb0c7486fc701"
+  integrity sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==
   dependencies:
     chokidar "^3.5.2"
     debug "^3.2.7"
     ignore-by-default "^1.0.1"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     pstree.remy "^1.1.8"
     semver "^5.7.1"
     simple-update-notifier "^1.0.7"
@@ -9618,13 +9467,6 @@ npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1, npm-registry-fetch@^13.3
     npm-package-arg "^9.0.1"
     proc-log "^2.0.0"
 
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
-
 npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -9637,13 +9479,13 @@ npm-user-validate@^1.0.1:
   resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561"
   integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==
 
-npm@^8.19.1:
-  version "8.19.1"
-  resolved "https://registry.yarnpkg.com/npm/-/npm-8.19.1.tgz#78bfc5fc1b7bc36881a2d9d1f2c93ad0246f31e5"
-  integrity sha512-FtWzipzng+NmtTQDXSCvA9D7H4d7vkA7ciahmY89fGK/Eo95pbnKn0hatEUfomj1jUDEXvAEi/tKiQ2nrAc7Jg==
+npm@^8.19.3:
+  version "8.19.3"
+  resolved "https://registry.yarnpkg.com/npm/-/npm-8.19.3.tgz#adb51bf8886d519dd4df162726d0ad157ecfa272"
+  integrity sha512-0QjmyPtDxSyMWWD8I91QGbrgx9KzbV6C9FK1liEb/K0zppiZkr5KxXc990G+LzPwBHDfRjUBlO9T1qZ08vl9mA==
   dependencies:
     "@isaacs/string-locale-compare" "^1.1.0"
-    "@npmcli/arborist" "^5.6.1"
+    "@npmcli/arborist" "^5.6.3"
     "@npmcli/ci-detect" "^2.0.0"
     "@npmcli/config" "^4.2.1"
     "@npmcli/fs" "^2.1.0"
@@ -9659,17 +9501,18 @@ npm@^8.19.1:
     cli-table3 "^0.6.2"
     columnify "^1.6.0"
     fastest-levenshtein "^1.0.12"
+    fs-minipass "^2.1.0"
     glob "^8.0.1"
     graceful-fs "^4.2.10"
-    hosted-git-info "^5.1.0"
+    hosted-git-info "^5.2.1"
     ini "^3.0.1"
     init-package-json "^3.0.2"
     is-cidr "^4.0.2"
     json-parse-even-better-errors "^2.3.1"
     libnpmaccess "^6.0.4"
     libnpmdiff "^4.0.5"
-    libnpmexec "^4.0.12"
-    libnpmfund "^3.0.3"
+    libnpmexec "^4.0.14"
+    libnpmfund "^3.0.5"
     libnpmhook "^8.0.4"
     libnpmorg "^4.0.4"
     libnpmpack "^4.1.3"
@@ -9678,6 +9521,7 @@ npm@^8.19.1:
     libnpmteam "^4.0.4"
     libnpmversion "^3.0.7"
     make-fetch-happen "^10.2.0"
+    minimatch "^5.1.0"
     minipass "^3.1.6"
     minipass-pipeline "^1.2.4"
     mkdirp "^1.0.4"
@@ -9761,6 +9605,11 @@ object-inspect@^1.12.0, object-inspect@^1.9.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
   integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
 
+object-inspect@^1.12.2:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
+  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
+
 object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -9776,31 +9625,41 @@ object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
-object.entries@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
-  integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
+object.assign@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    has-symbols "^1.0.3"
+    object-keys "^1.1.1"
 
-object.fromentries@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251"
-  integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==
+object.entries@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23"
+  integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
-object.hasown@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.1.tgz#ad1eecc60d03f49460600430d97f23882cf592a3"
-  integrity sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==
+object.fromentries@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73"
+  integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
+object.hasown@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92"
+  integrity sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==
   dependencies:
     define-properties "^1.1.4"
-    es-abstract "^1.19.5"
+    es-abstract "^1.20.4"
 
 object.pick@^1.2.0:
   version "1.3.0"
@@ -9809,14 +9668,14 @@ object.pick@^1.2.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
-  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
+object.values@^1.1.5, object.values@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
+  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
@@ -9869,7 +9728,7 @@ open-in-editor@^2.2.0:
     clap "^1.1.3"
     os-homedir "~1.0.2"
 
-open@^8.0.9:
+open@^8.0.9, open@^8.4.0:
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
   integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
@@ -9937,11 +9796,6 @@ p-cancelable@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
   integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
 
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -10016,16 +9870,6 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-package-json@^6.3.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
-  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
-  dependencies:
-    got "^9.6.0"
-    registry-auth-token "^4.0.0"
-    registry-url "^5.0.0"
-    semver "^6.2.0"
-
 pacote@^13.0.3, pacote@^13.6.1, pacote@^13.6.2:
   version "13.6.2"
   resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.6.2.tgz#0d444ba3618ab3e5cd330b451c22967bbd0ca48a"
@@ -10135,11 +9979,6 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -10235,17 +10074,17 @@ pkg-up@^3.1.0:
   dependencies:
     find-up "^3.0.0"
 
-playwright-core@1.25.2:
-  version "1.25.2"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.25.2.tgz#ea4baa398a4d45fcdfe48799482b599e3d0f033f"
-  integrity sha512-0yTbUE9lIddkEpLHL3u8PoCL+pWiZtj5A/j3U7YoNjcmKKDGBnCrgHJMzwd2J5vy6l28q4ki3JIuz7McLHhl1A==
+playwright-core@1.28.1:
+  version "1.28.1"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.28.1.tgz#8400be9f4a8d1c0489abdb9e75a4cc0ffc3c00cb"
+  integrity sha512-3PixLnGPno0E8rSBJjtwqTwJe3Yw72QwBBBxNoukIj3lEeBNXwbNiKrNuB1oyQgTBw5QHUhNO3SteEtHaMK6ag==
 
-playwright@^1.25.2:
-  version "1.25.2"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.25.2.tgz#0fc67e4385a52a51371ff9114bf68e3ad50a7f41"
-  integrity sha512-RwMB5SFRV/8wSfK+tK8ycpqdzORvoqUNz9DUeRfSgZFrZej5uuBl9wFjWcc+OkXFEtaPmx1acAVGG7hA4IJ1kg==
+playwright@^1.28.1:
+  version "1.28.1"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.28.1.tgz#f23247f1de466ff73d7230d94df96271e5da6583"
+  integrity sha512-92Sz6XBlfHlb9tK5UCDzIFAuIkHHpemA9zwUaqvo+w7sFMSmVMGmvKcbptof/eJObq63PGnMhM75x7qxhTR78Q==
   dependencies:
-    playwright-core "1.25.2"
+    playwright-core "1.28.1"
 
 plist@^3.0.1, plist@^3.0.4:
   version "3.0.5"
@@ -10348,14 +10187,14 @@ postcss-modules-values@^4.0.0:
   dependencies:
     icss-utils "^5.0.0"
 
-postcss-nested@5.0.6:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc"
-  integrity sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==
+postcss-nested@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.0.tgz#1572f1984736578f360cffc7eb7dca69e30d1735"
+  integrity sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==
   dependencies:
-    postcss-selector-parser "^6.0.6"
+    postcss-selector-parser "^6.0.10"
 
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.6:
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
   version "6.0.10"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
   integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
@@ -10382,10 +10221,10 @@ postcss@^6.0.14, postcss@^6.0.2:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^8.3.0, postcss@^8.4.14, postcss@^8.4.16, postcss@^8.4.7:
-  version "8.4.16"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c"
-  integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==
+postcss@^8.3.0, postcss@^8.4.18, postcss@^8.4.19:
+  version "8.4.19"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.19.tgz#61178e2add236b17351897c8bcc0b4c8ecab56fc"
+  integrity sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==
   dependencies:
     nanoid "^3.3.4"
     picocolors "^1.0.0"
@@ -10491,11 +10330,6 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
-promise-polyfill@^8.1.3:
-  version "8.2.3"
-  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.2.3.tgz#2edc7e4b81aff781c88a0d577e5fe9da822107c6"
-  integrity sha512-Og0+jCRQetV84U8wVjMNccfGCnMQ9mGs9Hv78QFe+pSDD3gWTpz0y+1QCuxy5d/vBFuZ3iwP2eycAkvqIMPmWg==
-
 promise-retry@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
@@ -10605,13 +10439,6 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-pupa@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62"
-  integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==
-  dependencies:
-    escape-goat "^2.0.0"
-
 q@^1.0.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -10700,7 +10527,7 @@ raw-body@2.5.1:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-rc@^1.2.7, rc@^1.2.8:
+rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -10777,29 +10604,28 @@ react-refresh@^0.14.0:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e"
   integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==
 
-react-router-dom@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.3.tgz#8779fc28e6691d07afcaf98406d3812fe6f11199"
-  integrity sha512-Ov0tGPMBgqmbu5CDmN++tv2HQ9HlWDuWIIqn4b88gjlAN5IHI+4ZUZRcpz9Hl0azFIwihbLDYw1OiHGRo7ZIng==
+react-router-dom@^5.3.4:
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.4.tgz#2ed62ffd88cae6db134445f4a0c0ae8b91d2e5e6"
+  integrity sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==
   dependencies:
     "@babel/runtime" "^7.12.13"
     history "^4.9.0"
     loose-envify "^1.3.1"
     prop-types "^15.6.2"
-    react-router "5.3.3"
+    react-router "5.3.4"
     tiny-invariant "^1.0.2"
     tiny-warning "^1.0.0"
 
-react-router@5.3.3, react-router@^5.2.0:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.3.tgz#8e3841f4089e728cf82a429d92cdcaa5e4a3a288"
-  integrity sha512-mzQGUvS3bM84TnbtMYR8ZjKnuPJ71IjSzR+DE6UkUqvN4czWIqEs17yLL8xkAycv4ev0AiN+IGrWu88vJs/p2w==
+react-router@5.3.4, react-router@^5.3.4:
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.4.tgz#8ca252d70fcc37841e31473c7a151cf777887bb5"
+  integrity sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==
   dependencies:
     "@babel/runtime" "^7.12.13"
     history "^4.9.0"
     hoist-non-react-statics "^3.1.0"
     loose-envify "^1.3.1"
-    mini-create-react-context "^0.4.0"
     path-to-regexp "^1.7.0"
     prop-types "^15.6.2"
     react-is "^16.6.0"
@@ -10813,18 +10639,20 @@ react-select-event@^5.5.1:
   dependencies:
     "@testing-library/dom" ">=7"
 
-react-select@^5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.4.0.tgz#81f6ac73906126706f104751ee14437bd16798f4"
-  integrity sha512-CjE9RFLUvChd5SdlfG4vqxZd55AZJRrLrHzkQyTYeHlpOztqcgnyftYAolJ0SGsBev6zAs6qFrjm6KU3eo2hzg==
+react-select@^5.6.1:
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.6.1.tgz#22f3d3f763ab24ac250739254f0191d46a2f1064"
+  integrity sha512-dYNRswtxUHW+F1Sc0HnxO5ryecPIAsG0+Cwyq5EIXZJBxCxUG2hFfQz41tc++30/2ISuuPglDikc4hEb4NsiuA==
   dependencies:
     "@babel/runtime" "^7.12.0"
     "@emotion/cache" "^11.4.0"
     "@emotion/react" "^11.8.1"
+    "@floating-ui/dom" "^1.0.1"
     "@types/react-transition-group" "^4.4.0"
-    memoize-one "^5.0.0"
+    memoize-one "^6.0.0"
     prop-types "^15.6.0"
     react-transition-group "^4.3.0"
+    use-isomorphic-layout-effect "^1.1.2"
 
 react-swipeable@^6.1.0:
   version "6.2.2"
@@ -10846,15 +10674,15 @@ react-transition-group@^4.3.0, react-transition-group@^4.4.0:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react-virtualized-auto-sizer@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.6.tgz#66c5b1c9278064c5ef1699ed40a29c11518f97ca"
-  integrity sha512-7tQ0BmZqfVF6YYEWcIGuoR3OdYe8I/ZFbNclFlGOC3pMqunkYF/oL30NCjSGl9sMEb17AnzixDz98Kqc3N76HQ==
+react-virtualized-auto-sizer@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.7.tgz#bfb8414698ad1597912473de3e2e5f82180c1195"
+  integrity sha512-Mxi6lwOmjwIjC1X4gABXMJcKHsOo0xWl3E3ugOgufB8GJU+MqrtY35aBuvCYv/razQ1Vbp7h1gWJjGjoNN5pmA==
 
-react-window@^1.8.7:
-  version "1.8.7"
-  resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.7.tgz#5e9fd0d23f48f432d7022cdb327219353a15f0d4"
-  integrity sha512-JHEZbPXBpKMmoNO1bNhoXOOLg/ujhL/BU4IqVU9r8eQPcy5KQnGHIHDRkJ0ns9IM5+Aq5LNwt3j8t3tIrePQzA==
+react-window@^1.8.8:
+  version "1.8.8"
+  resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.8.tgz#1b52919f009ddf91970cbdb2050a6c7be44df243"
+  integrity sha512-D4IiBeRtGXziZ1n0XklnFGu7h9gU684zepqyKzgPNzrsrk7xOCxni+TCckjg2Nr/DiaEEGVVmnhYSlT2rB47dQ==
   dependencies:
     "@babel/runtime" "^7.0.0"
     memoize-one ">=3.1.1 <6"
@@ -10988,7 +10816,7 @@ regenerator-runtime@^0.13.4:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
 
-regexp.prototype.flags@^1.4.1:
+regexp.prototype.flags@^1.4.1, regexp.prototype.flags@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
   integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
@@ -11002,20 +10830,6 @@ regexpp@^3.2.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-registry-auth-token@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
-  integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
-  dependencies:
-    rc "^1.2.8"
-
-registry-url@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
-  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
-  dependencies:
-    rc "^1.2.8"
-
 relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
@@ -11281,6 +11095,15 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
+safe-regex-test@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
+  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
+
 safe-stable-stringify@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz#ab67cbe1fe7d40603ca641c5e765cb942d04fc73"
@@ -11306,10 +11129,10 @@ sass-loader@^12.6.0:
     klona "^2.0.4"
     neo-async "^2.6.2"
 
-sass@^1.32.13, sass@^1.54.9:
-  version "1.54.9"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.9.tgz#b05f14ed572869218d1a76961de60cd647221762"
-  integrity sha512-xb1hjASzEH+0L0WI9oFjqhRi51t/gagWnxLiwUNMltA0Ab6jIDkAacgKiGYKM9Jhy109osM7woEEai6SXeJo5Q==
+sass@^1.32.13, sass@^1.56.1:
+  version "1.56.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.56.1.tgz#94d3910cd468fd075fa87f5bb17437a0b617d8a7"
+  integrity sha512-VpEyKpyBPCxE7qGDtOcdJ6fFbcpOM+Emu7uZLxVrkX8KVU/Dp5UF7WLvzqRuUhB6mqqQt1xffLoG+AndxTZrCQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -11368,7 +11191,7 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-selfsigned@^2.0.1, selfsigned@^2.1.1:
+selfsigned@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61"
   integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==
@@ -11380,14 +11203,7 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
   integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
 
-semver-diff@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
-  integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==
-  dependencies:
-    semver "^6.3.0"
-
-semver@^5.5.0, semver@^5.6.0, semver@^5.7.1:
+semver@^5.6.0, semver@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -11397,10 +11213,10 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -11513,27 +11329,20 @@ sharp@^0.30.4:
     tar-fs "^2.1.1"
     tunnel-agent "^0.6.0"
 
-sharp@^0.31.0:
-  version "0.31.0"
-  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.31.0.tgz#ce9b5202a5667486721cf07fd5b52360b1c2275a"
-  integrity sha512-ft96f8WzGxavg0rkLpMw90MTPMUZDyf0tHjPPh8Ob59xt6KzX8EqtotcqZGUm7kwqpX2pmYiyYX2LL0IZ/FDEw==
+sharp@^0.31.2:
+  version "0.31.2"
+  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.31.2.tgz#a8411c80512027f5a452b76d599268760c4e5dfa"
+  integrity sha512-DUdNVEXgS5A97cTagSLIIp8dUZ/lZtk78iNVZgHdHbx1qnQR7JAHY0BnXnwwH39Iw+VKhO08CTYhIg0p98vQ5Q==
   dependencies:
     color "^4.2.3"
     detect-libc "^2.0.1"
     node-addon-api "^5.0.0"
     prebuild-install "^7.1.1"
-    semver "^7.3.7"
+    semver "^7.3.8"
     simple-get "^4.0.1"
     tar-fs "^2.1.1"
     tunnel-agent "^0.6.0"
 
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -11541,25 +11350,11 @@ shebang-command@^2.0.0:
   dependencies:
     shebang-regex "^3.0.0"
 
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
 shebang-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-env@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shell-env/-/shell-env-3.0.1.tgz#515a62f6cbd5e139365be2535745e8e53438ce77"
-  integrity sha512-b09fpMipAQ9ObwvIeKoQFLDXcEcCpYUUZanlad4OYQscw2I49C/u97OPQg9jWYo36bRDn62fbe07oWYqovIvKA==
-  dependencies:
-    default-shell "^1.0.1"
-    execa "^1.0.0"
-    strip-ansi "^5.2.0"
-
 shell-quote@^1.7.3:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
@@ -11592,7 +11387,7 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
+signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -11635,6 +11430,11 @@ slash@3.0.0, slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
+slash@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
+  integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
+
 slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -11922,7 +11722,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -11940,18 +11740,18 @@ string-width@^3.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string.prototype.matchall@^4.0.7:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz#8e6ecb0d8a1fb1fda470d81acecb2dba057a481d"
-  integrity sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==
+string.prototype.matchall@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3"
+  integrity sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-    get-intrinsic "^1.1.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
     has-symbols "^1.0.3"
     internal-slot "^1.0.3"
-    regexp.prototype.flags "^1.4.1"
+    regexp.prototype.flags "^1.4.3"
     side-channel "^1.0.4"
 
 string.prototype.trimend@^1.0.5:
@@ -11993,7 +11793,7 @@ strip-ansi@^3.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+strip-ansi@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -12022,11 +11822,6 @@ strip-color@^0.1.0:
   resolved "https://registry.yarnpkg.com/strip-color/-/strip-color-0.1.0.tgz#106f65d3d3e6a2d9401cac0eb0ce8b8a702b4f7b"
   integrity sha512-p9LsUieSjWNNAxVCXLeilaDlmuUOrDS5/dF9znM1nZc7EGX5+zEFC0bEevsNIaldjlks+2jns5Siz6F9iK6jwA==
 
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
@@ -12124,6 +11919,14 @@ symbol-tree@^3.2.4:
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
+synckit@^0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.8.4.tgz#0e6b392b73fafdafcde56692e3352500261d64ec"
+  integrity sha512-Dn2ZkzMdSX827QbowGbU/4yjWuvNaCoScLLoMo/yKbu+P4GBR6cRGKZH27k6a9bRzdqcyd1DE96pQtQ6uNkmyw==
+  dependencies:
+    "@pkgr/utils" "^2.3.1"
+    tslib "^2.4.0"
+
 table@^5.4.1:
   version "5.4.6"
   resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
@@ -12134,10 +11937,10 @@ table@^5.4.1:
     slice-ansi "^2.1.0"
     string-width "^3.0.0"
 
-tailwindcss@^3.1.8:
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.1.8.tgz#4f8520550d67a835d32f2f4021580f9fddb7b741"
-  integrity sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==
+tailwindcss@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.2.4.tgz#afe3477e7a19f3ceafb48e4b083e292ce0dc0250"
+  integrity sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==
   dependencies:
     arg "^5.0.2"
     chokidar "^3.5.3"
@@ -12145,18 +11948,19 @@ tailwindcss@^3.1.8:
     detective "^5.2.1"
     didyoumean "^1.2.2"
     dlv "^1.1.3"
-    fast-glob "^3.2.11"
+    fast-glob "^3.2.12"
     glob-parent "^6.0.2"
     is-glob "^4.0.3"
     lilconfig "^2.0.6"
+    micromatch "^4.0.5"
     normalize-path "^3.0.0"
     object-hash "^3.0.0"
     picocolors "^1.0.0"
-    postcss "^8.4.14"
+    postcss "^8.4.18"
     postcss-import "^14.1.0"
     postcss-js "^4.0.0"
     postcss-load-config "^3.1.4"
-    postcss-nested "5.0.6"
+    postcss-nested "6.0.0"
     postcss-selector-parser "^6.0.10"
     postcss-value-parser "^4.2.0"
     quick-lru "^5.1.1"
@@ -12193,10 +11997,10 @@ tar-stream@^2.1.4, tar-stream@^2.2.0:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
-  version "6.1.11"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
-  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
+tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.12, tar@^6.1.2:
+  version "6.1.12"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.12.tgz#3b742fb05669b55671fb769ab67a7791ea1a62e6"
+  integrity sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
@@ -12313,6 +12117,14 @@ thunky@^1.0.2:
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
+tiny-glob@^0.2.9:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz#2212d441ac17928033b110f8b3640683129d31e2"
+  integrity sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==
+  dependencies:
+    globalyzer "0.1.0"
+    globrex "^0.1.2"
+
 tiny-invariant@^1.0.2, tiny-invariant@^1.0.6:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9"
@@ -12323,7 +12135,7 @@ tiny-relative-date@^1.3.0:
   resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
   integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==
 
-tiny-warning@^1.0.0, tiny-warning@^1.0.2, tiny-warning@^1.0.3:
+tiny-warning@^1.0.0, tiny-warning@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
@@ -12426,11 +12238,6 @@ tr46@^3.0.0:
   dependencies:
     punycode "^2.1.1"
 
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
-
 traverse-chain@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/traverse-chain/-/traverse-chain-0.1.0.tgz#61dbc2d53b69ff6091a12a168fd7d433107e40f1"
@@ -12463,10 +12270,10 @@ ts-essentials@^7.0.3:
   resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-7.0.3.tgz#686fd155a02133eedcc5362dc8b5056cde3e5a38"
   integrity sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==
 
-ts-loader@^9.3.1:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.3.1.tgz#fe25cca56e3e71c1087fe48dc67f4df8c59b22d4"
-  integrity sha512-OkyShkcZTsTwyS3Kt7a4rsT/t2qvEVQuKCTg4LJmpj9fhFR7ukGdZwV6Qq3tRUkqcXtfGpPR7+hFKHCG/0d3Lw==
+ts-loader@^9.4.1:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.1.tgz#b6f3d82db0eac5a8295994f8cb5e4940ff6b1060"
+  integrity sha512-384TYAqGs70rn9F0VBnh6BPTfhga7yFNdC5gXbQpDrBj9/KsT4iRkGqKXhziofHOlE2j6YEaiTYVGKKvPhGWvw==
   dependencies:
     chalk "^4.1.0"
     enhanced-resolve "^5.0.0"
@@ -12512,6 +12319,11 @@ tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
 
+tslib@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
+  integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
+
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
@@ -12603,29 +12415,22 @@ typed-regex@^0.0.8:
   resolved "https://registry.yarnpkg.com/typed-regex/-/typed-regex-0.0.8.tgz#e791c5e069dfe4af0fd0e1413891f20553be57a1"
   integrity sha512-1XkGm1T/rUngbFROIOw9wPnMAKeMsRoc+c9O6GwOHz6aH/FrJFtcyd2sHASbT0OXeGLot5N1shPNpwHGTv9RdQ==
 
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
-  dependencies:
-    is-typedarray "^1.0.0"
-
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typedoc-plugin-markdown@^3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.13.1.tgz#f4bca4bf8c5a48d8c7f1b44071e64028d223a1e0"
-  integrity sha512-Gx7pmvFNXAxbE9N2MuQNi5RwMVSH9lPxDBAaBNftaZ+ZzMO8YkDwir6aoXcWNq50qgG/eTs5CiKvLe33OVm2iQ==
+typedoc-plugin-markdown@^3.13.6:
+  version "3.13.6"
+  resolved "https://registry.yarnpkg.com/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.13.6.tgz#a419794e3bdbe459fb22772d8e6e02bac05211c1"
+  integrity sha512-ISSc9v3BK7HkokxSBuJPttXox4tJ6hP0N9wfSIk0fmLN67+eqtAxbk97gs2nDiuha+RTO5eW9gdeAb+RPP0mgg==
   dependencies:
     handlebars "^4.7.7"
 
-typedoc@0.23.14:
-  version "0.23.14"
-  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.23.14.tgz#d3af50b38fe98210ac39e112b5892f9d88546c93"
-  integrity sha512-s2I+ZKBET38EctZvbXp2GooHrNaKjWZkrwGEK/sttnOGiKJqU0vHrsdcwLgKZGuo2aedNL3RRPj1LnAAeYscig==
+typedoc@0.23.21:
+  version "0.23.21"
+  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.23.21.tgz#2a6b0e155f91ffa9689086706ad7e3e4bc11d241"
+  integrity sha512-VNE9Jv7BgclvyH9moi2mluneSviD43dCE9pY8RWkO88/DrEgJZk9KpUk7WO468c9WWs/+aG6dOnoH7ccjnErhg==
   dependencies:
     lunr "^2.3.9"
     marked "^4.0.19"
@@ -12651,10 +12456,10 @@ typescript-plugin-css-modules@^3.4.0:
     stylus "^0.54.8"
     tsconfig-paths "^3.9.0"
 
-typescript@^4.8.2:
-  version "4.8.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790"
-  integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==
+typescript@^4.9.3:
+  version "4.9.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.3.tgz#3aea307c1746b8c384435d8ac36b8a2e580d85db"
+  integrity sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==
 
 typical@^4.0.0:
   version "4.0.0"
@@ -12681,16 +12486,11 @@ undefsafe@^2.0.5:
   resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
   integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==
 
-underscore@1.7.0, underscore@^1.12.1:
+underscore@1.7.0, underscore@^1.12.1, underscore@^1.9.1:
   version "1.13.4"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.4.tgz#7886b46bbdf07f768e0052f1828e1dcab40c0dee"
   integrity sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ==
 
-underscore@^1.9.1:
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.3.tgz#54bc95f7648c5557897e5e968d0f76bc062c34ee"
-  integrity sha512-QvjkYpiD+dJJraRA8+dGAU4i7aBbb2s0S3jA45TFOvg2VgqvdCDd/3N6CqA8gluk1W91GLoXg5enMUx560QzuA==
-
 unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
@@ -12764,26 +12564,6 @@ unzip-crx-3@^0.2.0:
     mkdirp "^0.5.1"
     yaku "^0.16.6"
 
-update-notifier@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"
-  integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==
-  dependencies:
-    boxen "^5.0.0"
-    chalk "^4.1.0"
-    configstore "^5.0.1"
-    has-yarn "^2.1.0"
-    import-lazy "^2.1.0"
-    is-ci "^2.0.0"
-    is-installed-globally "^0.4.0"
-    is-npm "^5.0.0"
-    is-yarn-global "^0.3.0"
-    latest-version "^5.1.0"
-    pupa "^2.1.1"
-    semver "^7.3.4"
-    semver-diff "^3.1.1"
-    xdg-basedir "^4.0.0"
-
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -12811,6 +12591,11 @@ url-parse@^1.5.10:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
+use-isomorphic-layout-effect@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb"
+  integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==
+
 use-memo-one@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.2.tgz#0c8203a329f76e040047a35a1197defe342fab20"
@@ -12985,10 +12770,10 @@ wcwidth@^1.0.0:
   dependencies:
     defaults "^1.0.3"
 
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
+web-streams-polyfill@^3.0.3:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"
+  integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==
 
 webidl-conversions@^5.0.0:
   version "5.0.0"
@@ -13034,10 +12819,10 @@ webpack-dev-middleware@^5.3.1:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-server@*, webpack-dev-server@^4.11.0:
-  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.11.0.tgz#290ee594765cd8260adfe83b2d18115ea04484e7"
-  integrity sha512-L5S4Q2zT57SK7tazgzjMiSMBdsw+rGYIX27MgPgx7LDhWO0lViPrHKoLS7jo5In06PWYAhlYu3PbyoC6yAThbw==
+webpack-dev-server@*, webpack-dev-server@^4.11.1:
+  version "4.11.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz#ae07f0d71ca0438cf88446f09029b92ce81380b5"
+  integrity sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
@@ -13062,7 +12847,7 @@ webpack-dev-server@*, webpack-dev-server@^4.11.0:
     p-retry "^4.5.0"
     rimraf "^3.0.2"
     schema-utils "^4.0.0"
-    selfsigned "^2.0.1"
+    selfsigned "^2.1.1"
     serve-index "^1.9.1"
     sockjs "^0.3.24"
     spdy "^4.0.2"
@@ -13095,10 +12880,10 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5, webpack@^5.1.0, webpack@^5.74.0:
-  version "5.74.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
-  integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
+webpack@^5, webpack@^5.1.0, webpack@^5.75.0:
+  version "5.75.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152"
+  integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^0.0.51"
@@ -13179,14 +12964,6 @@ whatwg-url@^11.0.0:
     tr46 "^3.0.0"
     webidl-conversions "^7.0.0"
 
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
 whatwg-url@^8.0.0, whatwg-url@^8.5.0:
   version "8.7.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
@@ -13207,13 +12984,6 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
 which@^2.0.1, which@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@@ -13228,13 +12998,6 @@ wide-align@^1.1.5:
   dependencies:
     string-width "^1.0.2 || 2 || 3 || 4"
 
-widest-line@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
-  integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==
-  dependencies:
-    string-width "^4.0.0"
-
 wildcard@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
@@ -13250,15 +13013,6 @@ win-ca@^3.5.0:
     node-forge "^1.2.1"
     split "^1.0.1"
 
-winston-console-format@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/winston-console-format/-/winston-console-format-1.0.8.tgz#591adc8e9567c3397a3fa2e29e596d56e48db840"
-  integrity sha512-dq7t/E0D0QRi4XIOwu6HM1+5e//WPqylH88GVjKEhQVrzGFg34MCz+G7pMJcXFBen9C0kBsu5GYgbYsE2LDwKw==
-  dependencies:
-    colors "^1.4.0"
-    logform "^2.2.0"
-    triple-beam "^1.3.0"
-
 winston-transport-browserconsole@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/winston-transport-browserconsole/-/winston-transport-browserconsole-1.0.5.tgz#8ef1bc32da5fb0a66604f2b8b6f127ed725108c9"
@@ -13317,17 +13071,7 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
-  dependencies:
-    imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
-
-write-file-atomic@^4.0.0:
+write-file-atomic@^4.0.0, write-file-atomic@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
   integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
@@ -13335,28 +13079,15 @@ write-file-atomic@^4.0.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"
 
-write-file-atomic@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
-  integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==
-  dependencies:
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.7"
-
 ws@^7.3.1, ws@^7.4.6:
   version "7.5.7"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
   integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
 
-ws@^8.2.3, ws@^8.4.2, ws@^8.8.1:
-  version "8.8.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0"
-  integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==
-
-xdg-basedir@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
-  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
+ws@^8.11.0, ws@^8.2.3, ws@^8.4.2:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
+  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
@@ -13435,12 +13166,12 @@ yargs-parser@^21.0.0:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
   integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
 
-yargs@^17.0.1, yargs@^17.3.1:
-  version "17.5.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e"
-  integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==
+yargs@^17.3.1, yargs@^17.5.1:
+  version "17.6.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c"
+  integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==
   dependencies:
-    cliui "^7.0.2"
+    cliui "^8.0.1"
     escalade "^3.1.1"
     get-caller-file "^2.0.5"
     require-directory "^2.1.1"